Convert cron, ceramic and websockets into monorepo apps (#4556)

* clean up sub-apps * add yml for websockets and cron * fix install * fix types for theme * add test env files * add test command to sockets * fix socket tests * add test command for scouts * add docker files * fix types * fix dockerfile * fix install args * fix tpl * .. * fix script * fix checkout * add to staging cleanup * add to destroy staging * pass secrest in * remove env * ci everything * rebuild npm * try installing again * remove use of dotenv * allow custom health check * fix env for deploy * copy generated files * update health check port * update prod stack * remove ssl if one is not specified * fix cofnig * fix staging config * override port of default process health check * fix staging github destroy * fix command * fix edxports in cv * update health check * fix health check * update ports on health check * update staging * remove cron tests * build scokets * try pointing to other socket env * remove sockets from staging * dont use special port * cleanup webapp build * fix socket staging * .. * fix eslint * fix e2e for webapp * fix staging again
charmverse · Sep 9, 2024 · 861f7e4 · 861f7e4
1 parent 55a560c
commit 861f7e4
Show file tree

Hide file tree

Showing 314 changed files with 4,396 additions and 4,645 deletions.
diff --git a/.cdk/ProductionStack.ts b/.cdk/ProductionStack.ts
@@ -4,11 +4,19 @@ import * as s3assets from 'aws-cdk-lib/aws-s3-assets';
 import { Construct } from 'constructs';
 
 export type Options = {
-  sslCert: string;
+  healthCheck?: { port: number; path: string };
+  sslCert?: string;
 };
 
+const defaultHealthCheck = { path: '/api/health', port: 80 };
+
 export class ProductionStack extends Stack {
-  constructor(scope: Construct, appName: string, props: StackProps, options: Options) {
+  constructor(
+    scope: Construct,
+    appName: string,
+    props: StackProps,
+    { sslCert, healthCheck = defaultHealthCheck }: Options
+  ) {
     super(scope, appName, props);
 
     const webAppZipArchive = new s3assets.Asset(this, 'WebAppZip', {
@@ -45,8 +53,6 @@ export class ProductionStack extends Stack {
       Version: 1
     };
 
-    const sslCert = 'arn:aws:acm:us-east-1:310849459438:certificate/4618b240-08da-4d91-98c1-ac12362be229';
-
     // list of all options: https://docs.aws.amazon.com/elasticbeanstalk/latest/dg/command-options-general.html
     const optionSettingProperties: elasticbeanstalk.CfnEnvironment.OptionSettingProperty[] = [
       {
@@ -79,26 +85,30 @@ export class ProductionStack extends Stack {
         optionName: 'ConfigDocument',
         value: JSON.stringify(healthReportingSystemConfig)
       },
-      {
-        namespace: 'aws:elbv2:listener:443',
-        optionName: 'Protocol',
-        value: 'HTTPS'
-      },
-      {
-        namespace: 'aws:elbv2:listener:443',
-        optionName: 'ListenerEnabled',
-        value: 'true'
-      },
-      {
-        namespace: 'aws:elbv2:listener:443',
-        optionName: 'SSLCertificateArns',
-        value: options.sslCert
-      },
-      {
-        namespace: 'aws:elbv2:listener:443',
-        optionName: 'SSLPolicy',
-        value: 'ELBSecurityPolicy-TLS13-1-2-2021-06'
-      },
+      ...(sslCert
+        ? [
+            {
+              namespace: 'aws:elbv2:listener:443',
+              optionName: 'Protocol',
+              value: 'HTTPS'
+            },
+            {
+              namespace: 'aws:elbv2:listener:443',
+              optionName: 'ListenerEnabled',
+              value: 'true'
+            },
+            {
+              namespace: 'aws:elbv2:listener:443',
+              optionName: 'SSLCertificateArns',
+              value: sslCert
+            },
+            {
+              namespace: 'aws:elbv2:listener:443',
+              optionName: 'SSLPolicy',
+              value: 'ELBSecurityPolicy-TLS13-1-2-2021-06'
+            }
+          ]
+        : []),
       {
         // add security group to access
         namespace: 'aws:autoscaling:launchconfiguration',
@@ -130,11 +140,26 @@ export class ProductionStack extends Stack {
         optionName: 'InstanceTypes',
         value: 't3a.small,t3.small'
       },
+      {
+        namespace: 'aws:elasticbeanstalk:environment:process:default',
+        optionName: 'HealthCheckPath',
+        value: healthCheck.path
+      },
+      {
+        namespace: 'aws:elasticbeanstalk:environment:process:default',
+        optionName: 'MatcherHTTPCode',
+        value: '200'
+      },
+      {
+        namespace: 'aws:elasticbeanstalk:environment:process:default',
+        optionName: 'Port',
+        value: healthCheck.port?.toString() || '80'
+      },
       {
         // ALB health check
         namespace: 'aws:elasticbeanstalk:application',
         optionName: 'Application Healthcheck URL',
-        value: '/api/health'
+        value: healthCheck.path
       }
     ];
 

diff --git a/.cdk/StagingStack.ts b/.cdk/StagingStack.ts
@@ -6,10 +6,20 @@ import { Construct } from 'constructs';
 
 const domain = 'charmverse.co';
 
-type CustomOptions = { options?: elasticbeanstalk.CfnEnvironment.OptionSettingProperty[] };
+type CustomOptions = {
+  healthCheck?: { port: number; path: string };
+  options?: elasticbeanstalk.CfnEnvironment.OptionSettingProperty[];
+};
+
+const defaultHealthCheck = { path: '/api/health', port: 80 };
 
 export class StagingStack extends Stack {
-  constructor(scope: Construct, appName: string, props: StackProps, { options = [] }: CustomOptions = {}) {
+  constructor(
+    scope: Construct,
+    appName: string,
+    props: StackProps,
+    { healthCheck = defaultHealthCheck, options = [] }: CustomOptions = {}
+  ) {
     super(scope, appName, props);
 
     const webAppZipArchive = new s3assets.Asset(this, 'WebAppZip', {
@@ -131,11 +141,26 @@ export class StagingStack extends Stack {
         optionName: 'InstanceTypes',
         value: 't3a.small,t3.small'
       },
+      {
+        namespace: 'aws:elasticbeanstalk:environment:process:default',
+        optionName: 'HealthCheckPath',
+        value: healthCheck.path
+      },
+      {
+        namespace: 'aws:elasticbeanstalk:environment:process:default',
+        optionName: 'MatcherHTTPCode',
+        value: '200'
+      },
+      {
+        namespace: 'aws:elasticbeanstalk:environment:process:default',
+        optionName: 'Port',
+        value: healthCheck.port?.toString() || '80'
+      },
       {
         // ALB health check
         namespace: 'aws:elasticbeanstalk:application',
         optionName: 'Application Healthcheck URL',
-        value: '/api/health'
+        value: healthCheck.path
       },
       {
         namespace: 'aws:elasticbeanstalk:application:environment',

diff --git a/.cdk/WebappStagingStack.ts b/.cdk/WebappStagingStack.ts
@@ -5,43 +5,43 @@ import { Construct } from 'constructs';
 export class WebappStagingStack extends StagingStack {
   constructor(scope: Construct, id: string, props: StackProps) {
     super(scope, id, props, {
-      options: [
-        {
-          namespace: 'aws:elasticbeanstalk:environment:process:websocket',
-          optionName: 'HealthCheckPath',
-          value: '/health_check'
-        },
-        {
-          namespace: 'aws:elasticbeanstalk:environment:process:websocket',
-          optionName: 'Port',
-          value: '3002'
-        },
-        {
-          namespace: 'aws:elasticbeanstalk:environment:process:websocket',
-          optionName: 'Protocol',
-          value: 'HTTP'
-        },
-        {
-          namespace: 'aws:elbv2:listener:3002',
-          optionName: 'ListenerEnabled',
-          value: 'true'
-        },
-        {
-          namespace: 'aws:elbv2:listener:3002',
-          optionName: 'Protocol',
-          value: 'HTTPS'
-        },
-        {
-          namespace: 'aws:elbv2:listener:3002',
-          optionName: 'SSLCertificateArns',
-          value: 'arn:aws:acm:us-east-1:310849459438:certificate/bfea3120-a440-4667-80fd-d285146f2339'
-        },
-        {
-          namespace: 'aws:elbv2:listener:3002',
-          optionName: 'DefaultProcess',
-          value: 'websocket'
-        }
-      ]
+      // options: [
+      //   {
+      //     namespace: 'aws:elasticbeanstalk:environment:process:websocket',
+      //     optionName: 'HealthCheckPath',
+      //     value: '/api/health'
+      //   },
+      //   {
+      //     namespace: 'aws:elasticbeanstalk:environment:process:websocket',
+      //     optionName: 'Port',
+      //     value: '3002'
+      //   },
+      //   {
+      //     namespace: 'aws:elasticbeanstalk:environment:process:websocket',
+      //     optionName: 'Protocol',
+      //     value: 'HTTP'
+      //   },
+      //   {
+      //     namespace: 'aws:elbv2:listener:3002',
+      //     optionName: 'ListenerEnabled',
+      //     value: 'true'
+      //   },
+      //   {
+      //     namespace: 'aws:elbv2:listener:3002',
+      //     optionName: 'Protocol',
+      //     value: 'HTTPS'
+      //   },
+      //   {
+      //     namespace: 'aws:elbv2:listener:3002',
+      //     optionName: 'SSLCertificateArns',
+      //     value: 'arn:aws:acm:us-east-1:310849459438:certificate/bfea3120-a440-4667-80fd-d285146f2339'
+      //   },
+      //   {
+      //     namespace: 'aws:elbv2:listener:3002',
+      //     optionName: 'DefaultProcess',
+      //     value: 'websocket'
+      //   }
+      // ]
     });
   }
 }
diff --git a/.cdk/bin/app.ts b/.cdk/bin/app.ts
@@ -30,6 +30,13 @@ else if (
   new ProductionStack(app, stackNameParam, deployProps, {
     sslCert: 'arn:aws:acm:us-east-1:310849459438:certificate/b901f27e-5a33-4dea-b4fb-39308a580423'
   });
+} else if (stackNameParam === 'prd-ceramic') {
+  new ProductionStack(app, stackNameParam, deployProps, {
+    healthCheck: {
+      path: '/graphql',
+      port: 5001
+    }
+  });
 }
 // Connect webapp and api production
 else if (stackNameParam.startsWith('prd')) {
@@ -38,6 +45,10 @@ else if (stackNameParam.startsWith('prd')) {
   });
 } else if (stackNameParam.startsWith('stg-webapp')) {
   new WebappStagingStack(app, stackNameParam, deployProps);
+} else if (stackNameParam.startsWith('stg-websockets')) {
+  new StagingStack(app, stackNameParam, deployProps, { healthCheck: { path: '/api/health', port: 3002 } });
+} else if (stackNameParam.startsWith('stg-ceramic')) {
+  new StagingStack(app, stackNameParam, deployProps, { healthCheck: { path: '/graphql', port: 5001 } });
 } else if (stackNameParam.startsWith('stg-')) {
   new StagingStack(app, stackNameParam, deployProps);
 } else {

diff --git a/.ebextensions/ceramic/00_env_vars.config b/.ebextensions/ceramic/00_env_vars.config
@@ -10,5 +10,5 @@ option_settings:
         EBSTALK_ENV_FILE: "ceramic.env"
         SERVICE_ENV: "prd" # this sets the value of datadog env tag
         SERVICE_NAME: "ceramic"
-        IMGNAME: "charmverse-web3-workspace"
+        IMGNAME: "ceramic"
         IMGTAG: ""
diff --git a/.ebextensions/cron/00_env_vars.config b/.ebextensions/cron/00_env_vars.config
@@ -10,5 +10,5 @@ option_settings:
         EBSTALK_ENV_FILE: "cron.env"
         SERVICE_ENV:  "prd"
         SERVICE_NAME: "cron"
-        IMGNAME: "charmverse-web3-workspace"
+        IMGNAME: "cron"
         IMGTAG: ""
diff --git a/.ebextensions/websockets/00_env_vars.config b/.ebextensions/websockets/00_env_vars.config
@@ -10,5 +10,5 @@ option_settings:
         EBSTALK_ENV_FILE: "websocket.env"
         SERVICE_ENV: "prd" # this sets the value of datadog env tag
         SERVICE_NAME: "websockets"
-        IMGNAME: "charmverse-web3-workspace"
+        IMGNAME: "websockets"
         IMGTAG: ""
diff --git a/.eslintignore b/.eslintignore
@@ -2,4 +2,4 @@ scripts/
 dist/
 .next/
 
-background/ceramicServer/generated/
+apps/ceramic/src/generated/
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,7 +6,7 @@
     "node": true
   },
   "settings": {
-    "import/internal-regex": "^(adapters|background|charmClient|components|config|context|db|hooks|lib|models|pages|public|seedData|testing|theme)",
+    "import/internal-regex": "^(adapters|charmClient|components|config|context|db|hooks|lib|models|pages|public|seedData|testing|theme)",
     "import/resolver": {
       "node": {
         "moduleDirectory": ["node_modules"]
@@ -76,7 +76,7 @@
       "error",
       {
         "devDependencies": true,
-        "packageDir": ["./", "./@connect-shared", "./packages/charmeditor/", "./apps/farcaster/", "./apps/scoutgame/", "./apps/sunnyawards/", "./apps/waitlist/"]
+        "packageDir": ["./", "./@connect-shared", "./packages/charmeditor/", "./apps/farcaster/", "./apps/scoutgame/", "./apps/sunnyawards/", "./apps/waitlist/", "./apps/websockets/", "./apps/cron/", "./apps/ceramic/"]
       }
     ],
     "import/order": [

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
@@ -1,9 +1,7 @@
 name: 'Build application'
+description: ''
 
 inputs:
-  save_cache:
-    description: 'Whether to save the cache'
-    required: false
   REACT_APP_APP_ENV:
     description: '...'
     required: false
@@ -17,32 +15,29 @@ runs:
     #     GITHUB_CONTEXT: ${{ toJson(github) }}
     #   run: echo "$GITHUB_CONTEXT"
 
+    - name: Get last Git commit hashes for cache key
+      shell: bash
+      # Instead of hasing files, use the latest git commit in a directory to speed up cache key https://github.com/actions/runner/issues/1840#issuecomment-2094847172
+      run: |
+        echo "NPM_PACKAGES_COMMIT=$(git log -1 --pretty=format:%H -- package-lock.json)" >> $GITHUB_ENV
+        echo "SOURCE_CODE_COMMIT=$(git log -1 --pretty=format:%H -- lib components packages public pages hooks charmClient adapters abi config connectors)" >> $GITHUB_ENV
+
     - name: Restore build
       id: restore_build
-      uses: actions/cache/restore@v4
+      uses: actions/cache@v4
       with:
         path: |
           .next
           .env.test.local
           dist
-          background/ceramicServer/generated
         key: webapp-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.ts', '**/*.tsx', '**/*.gql', '**/*.scss', '!node_modules', '!.next', '!dist', '!apps') }}
         restore-keys: |
           webapp-${{ hashFiles('**/package-lock.json') }}-
 
     - name: Build
       shell: bash
       if: steps.restore_build.outputs.cache-hit != 'true'
-      run: npm run build
-
-    # building cache key takes almost a minute, so we only run this if we are saving the cache
-    - name: Cache build
-      if: inputs.save_cache
-      uses: actions/cache/save@v4
-      with:
-        path: |
-          .next
-          .env.test.local
-          dist
-          background/ceramicServer/generated
-        key: webapp-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('**/*.ts', '**/*.tsx', '**/*.gql', '**/*.scss', '!node_modules', '!.next', '!dist', '!apps') }}
+      # Build the sockets for e2e tests to run
+      run: |
+        npm run webapp:build
+        npm run sockets:build
diff --git a/.github/actions/build_app/action.yml b/.github/actions/build_app/action.yml
@@ -1,8 +1,9 @@
 name: 'Build app'
+description: ''
 
 inputs:
   app_name:
-    description: The name of the app'
+    description: 'The name of the app'
     required: true
 
 runs:
@@ -24,8 +25,6 @@ runs:
         path: |
           apps/${{ inputs.app_name }}/.next
           apps/${{ inputs.app_name }}/public
-        # Generate a new cache whenever packages or source files change.
-        # key: app-${{ inputs.app_name }}-${{ hashFiles('**/package-lock.json') }}-${{ hashFiles('lib/**/*.ts', 'lib/**/*.tsx', '@connect-shared/**/*.ts', '@connect-shared/**/*.tsx', format('apps/{0}/**/*.ts', inputs.app_name), format('apps/{0}/**/*.tsx', inputs.app_name), format('apps/{0}/**/*.scss', inputs.app_name)) }}
         key: app-${{ inputs.app_name }}-${{ env.NPM_PACKAGES_COMMIT }}-${{ env.SOURCE_CODE_COMMIT }}
         restore-keys: |
           app-${{ inputs.app_name }}-${{ env.NPM_PACKAGES_COMMIT }}-
@@ -34,4 +33,4 @@ runs:
       shell: bash
       if: steps.restore_build.outputs.cache-hit != 'true'
       run: |
-        npm run ${{ inputs.app_name }}:build
+        npm run build -w apps/${{ inputs.app_name }}
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,4 +2,4 @@ scripts/ @@
     dist/
     .next/
-    background/ceramicServer/generated/
+    apps/ceramic/src/generated/