GTBitsOfGood · tmthecoder · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024 · Feb 13, 2024
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -2,10 +2,10 @@ FROM alpine as grpc-probe
 
 ARG TARGETARCH
 
-RUN --mount=type=cache,target=/var/cache/apk apk add wget
-
 COPY ./docker/get_grpc_probe.sh /get_grpc_probe.sh
 
+RUN --mount=type=cache,target=/var/cache/apk apk add --update wget
+
 RUN TARGETARCH=$TARGETARCH ./get_grpc_probe.sh
 
 FROM node:18-alpine as deps

diff --git a/docker/docker-compose-live-packages.yml b/docker/docker-compose-live-packages.yml
@@ -3,49 +3,49 @@ services:
     extends:
       file: docker-compose-dev.yml
       service: api-gateway
+    volumes:
+      - ./packages/api-gateway:/app/packages/api-gateway
+      - /app/packages/api-gateway/node_modules
     develop:
       watch:
-        - action: sync
-          path: ./packages/api-gateway
-          target: /app/packages/api-gateway
-          ignore:
-            - ./packages/api-gateway/node_modules
         - action: rebuild
           path: ./package.json
         - action: rebuild
           path: ./packages/api-gateway/package.json
+        - action: rebuild
+          path: ./Dockerfile.dev
 
   auth-service:
     extends:
       file: docker-compose-dev.yml
       service: auth-service
+    volumes:
+      - ./packages/auth-service:/app/packages/auth-service
+      - /app/packages/auth-service/node_modules
     develop:
       watch:
-        - action: sync
-          path: ./packages/auth-service
-          target: /app/packages/auth-service
-          ignore:
-            - ./packages/auth-service/node_modules
         - action: rebuild
           path: ./package.json
         - action: rebuild
           path: ./packages/auth-service/package.json
+        - action: rebuild
+          path: ./Dockerfile.dev
 
   db-service:
     extends:
       file: docker-compose-dev.yml
       service: db-service
+    volumes:
+      - ./packages/db-service:/app/packages/db-service
+      - /app/packages/db-service/node_modules
     develop:
       watch:
-        - action: sync
-          path: ./packages/db-service
-          target: /app/packages/db-service
-          ignore:
-            - ./packages/db-service/node_modules
         - action: rebuild
           path: ./package.json
         - action: rebuild
           path: ./packages/db-service/package.json
+        - action: rebuild
+          path: ./Dockerfile.dev
 
   db:
     extends:

diff --git a/docker/docker-compose-live-proto.yml b/docker/docker-compose-live-proto.yml
@@ -3,52 +3,34 @@ services:
     extends:
       file: docker-compose-dev.yml
       service: api-gateway
+    volumes:
+      - ./packages/proto/dist:/app/packages/node_modules/juno-proto/dist
     develop:
       watch:
-        - action: sync
-          path: ./packages/proto
-          target: /app/packages/proto
-          ignore:
-            - ./packages/proto/node_modules
-        - action: sync
-          path: ./packages/proto
-          target: /app/packages/node_modules/juno-proto
-          ignore:
-            - ./packages/proto/node_modules
+        - action: rebuild
+          path: ./packages/proto/package.json
 
   auth-service:
     extends:
       file: docker-compose-dev.yml
       service: auth-service
+    volumes:
+      - ./packages/proto/dist:/app/packages/node_modules/juno-proto/dist
     develop:
       watch:
-        - action: sync
-          path: ./packages/proto
-          target: /app/packages/proto
-          ignore:
-            - ./packages/proto/node_modules
-        - action: sync
-          path: ./packages/proto
-          target: /app/packages/node_modules/juno-proto
-          ignore:
-            - ./packages/proto/node_modules
+        - action: rebuild
+          path: ./packages/proto/package.json
 
   db-service:
     extends:
       file: docker-compose-dev.yml
       service: db-service
+    volumes:
+      - ./packages/proto/dist:/app/packages/node_modules/juno-proto/dist
     develop:
       watch:
-        - action: sync
-          path: ./packages/proto
-          target: /app/packages/proto
-          ignore:
-            - ./packages/proto/node_modules
-        - action: sync
-          path: ./packages/proto
-          target: /app/packages/node_modules/juno-proto
-          ignore:
-            - ./packages/proto/node_modules
+        - action: rebuild
+          path: ./packages/proto/package.json
 
   db:
     extends:

diff --git a/packages/api-gateway/package.json b/packages/api-gateway/package.json
@@ -18,7 +18,7 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json --runInBand",
-    "test:e2e:watch": "jest --config ./test/jest-e2e.json --runInBand --watch",
+    "test:e2e:watch": "jest --config ./test/jest-e2e.json --runInBand --watchAll",
     "tsc": "tsc"
   },
   "dependencies": {

diff --git a/packages/api-gateway/test/project.e2e-spec.ts b/packages/api-gateway/test/project.e2e-spec.ts
@@ -13,6 +13,8 @@ import * as ProtoLoader from '@grpc/proto-loader';
 
 let app: INestApplication;
 
+jest.setTimeout(10000);
+
 beforeAll(async () => {
   const proto = ProtoLoader.loadSync([ResetProtoFile]) as any;
 

diff --git a/packages/api-gateway/test/user.e2e-spec.ts b/packages/api-gateway/test/user.e2e-spec.ts
@@ -13,6 +13,8 @@ import * as ProtoLoader from '@grpc/proto-loader';
 
 let app: INestApplication;
 
+jest.setTimeout(10000);
+
 beforeAll(async () => {
   const proto = ProtoLoader.loadSync([ResetProtoFile]) as any;
 

diff --git a/packages/auth-service/package.json b/packages/auth-service/package.json
@@ -18,7 +18,7 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json --runInBand",
-    "test:e2e:watch": "jest --config ./test/jest-e2e.json --runInBand --watch",
+    "test:e2e:watch": "jest --config ./test/jest-e2e.json --runInBand --watchAll",
     "tsc": "tsc"
   },
   "dependencies": {

diff --git a/packages/auth-service/test/app.e2e-spec.ts b/packages/auth-service/test/app.e2e-spec.ts
@@ -13,6 +13,8 @@ import {
 } from 'juno-proto';
 
 let app: INestMicroservice;
+
+jest.setTimeout(10000);
 // TODO: make api key tests actually work once implemented
 
 const { AUTHSERVICE_API_KEY_PACKAGE_NAME } = ApiKeyProto;

diff --git a/packages/db-service/package.json b/packages/db-service/package.json
@@ -18,7 +18,7 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json --runInBand",
-    "test:e2e:watch": "jest --config ./test/jest-e2e.json --runInBand --watch"
+    "test:e2e:watch": "jest --config ./test/jest-e2e.json --runInBand --watchAll"
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.9.7",

diff --git a/packages/db-service/test/project.e2e-spec.ts b/packages/db-service/test/project.e2e-spec.ts
@@ -19,6 +19,8 @@ const { DBSERVICE_PROJECT_PACKAGE_NAME } = ProjectProto;
 
 let app: INestMicroservice;
 
+jest.setTimeout(10000);
+
 async function initApp() {
   const moduleFixture: TestingModule = await Test.createTestingModule({
     imports: [AppModule],

diff --git a/packages/db-service/test/user.e2e-spec.ts b/packages/db-service/test/user.e2e-spec.ts
@@ -20,6 +20,8 @@ const { DBSERVICE_PROJECT_PACKAGE_NAME } = ProjectProto;
 
 let app: INestMicroservice;
 
+jest.setTimeout(10000);
+
 async function initApp() {
   const moduleFixture: TestingModule = await Test.createTestingModule({
     imports: [AppModule],

diff --git a/packages/proto/copy_protos.sh b/packages/proto/copy_protos.sh
@@ -0,0 +1,13 @@
+EXEC_PATH=${EXEC_PATH-.}
+
+mkdir -p ../${EXEC_PATH}/api-gateway/node_modules/juno-proto/dist
+mkdir -p ../${EXEC_PATH}/auth-service/node_modules/juno-proto/dist
+mkdir -p ../${EXEC_PATH}/db-service/node_modules/juno-proto/dist
+
+cp -r ${EXEC_PATH}/dist/* ../${EXEC_PATH}/api-gateway/node_modules/juno-proto/dist
+cp -r ${EXEC_PATH}/dist/* ../${EXEC_PATH}/auth-service/node_modules/juno-proto/dist
+cp -r ${EXEC_PATH}/dist/* ../${EXEC_PATH}/db-service/node_modules/juno-proto/dist
+
+cp -r ${EXEC_PATH}/package.json ../${EXEC_PATH}/api-gateway/node_modules/juno-proto/
+cp -r ${EXEC_PATH}/package.json ../${EXEC_PATH}/auth-service/node_modules/juno-proto/
+cp -r ${EXEC_PATH}/package.json ../${EXEC_PATH}/db-service/node_modules/juno-proto/
diff --git a/packages/proto/gen_protos.sh b/packages/proto/gen_protos.sh
@@ -12,27 +12,3 @@ protoc \
     --ts_proto_opt=lowerCaseServiceMethods=false \
     -I ${EXEC_PATH}/definitions/ \
     ${EXEC_PATH}/definitions/*.proto
-
-rm -rf ../${EXEC_PATH}/api-gateway/node_modules/juno-proto
-rm -rf ../${EXEC_PATH}/auth-service/node_modules/juno-proto
-rm -rf ../${EXEC_PATH}/db-service/node_modules/juno-proto
-
-mkdir -p ../${EXEC_PATH}/api-gateway/node_modules/juno-proto/dist
-mkdir -p ../${EXEC_PATH}/auth-service/node_modules/juno-proto/dist
-mkdir -p ../${EXEC_PATH}/db-service/node_modules/juno-proto/dist
-
-mkdir -p ../${EXEC_PATH}/api-gateway/node_modules/juno-proto/definitions
-mkdir -p ../${EXEC_PATH}/auth-service/node_modules/juno-proto/definitions
-mkdir -p ../${EXEC_PATH}/db-service/node_modules/juno-proto/definitions
-
-cp -r ${EXEC_PATH}/dist/* ../${EXEC_PATH}/api-gateway/node_modules/juno-proto/dist
-cp -r ${EXEC_PATH}/dist/* ../${EXEC_PATH}/auth-service/node_modules/juno-proto/dist
-cp -r ${EXEC_PATH}/dist/* ../${EXEC_PATH}/db-service/node_modules/juno-proto/dist
-
-cp -r ${EXEC_PATH}/definitions/* ../${EXEC_PATH}/api-gateway/node_modules/juno-proto/definitions
-cp -r ${EXEC_PATH}/definitions/* ../${EXEC_PATH}/auth-service/node_modules/juno-proto/definitions
-cp -r ${EXEC_PATH}/definitions/* ../${EXEC_PATH}/db-service/node_modules/juno-proto/definitions
-
-cp -r ${EXEC_PATH}/package.json ../${EXEC_PATH}/api-gateway/node_modules/juno-proto/
-cp -r ${EXEC_PATH}/package.json ../${EXEC_PATH}/auth-service/node_modules/juno-proto/
-cp -r ${EXEC_PATH}/package.json ../${EXEC_PATH}/db-service/node_modules/juno-proto/
diff --git a/packages/proto/package.json b/packages/proto/package.json
@@ -4,7 +4,7 @@
   "main": "dist/main.js",
   "license": "MIT",
   "scripts": {
-    "build": "yarn gen-proto && yarn format && tsc && ncp ./definitions ./dist/definitions",
+    "build": "yarn gen-proto && yarn format && tsc && ncp ./definitions ./dist/definitions && yarn copy-changes",
     "format": "prettier --write \"src/**/*.ts\"",
     "lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
     "test": "jest",
@@ -13,7 +13,8 @@
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
     "tsc": "tsc && cp -r ./definitions ./dist/",
-    "gen-proto": "bash ./gen_protos.sh"
+    "gen-proto": "bash ./gen_protos.sh",
+    "copy-changes": "bash ./copy_protos.sh"
   },
   "dependencies": {
     "@nestjs/common": "^10.3.0",