chore(release): publish new version

- @standardnotes/auth-server@1.89.4

.dockerignore

@@ -0,0 +1,13 @@
+dist
+coverage
+
+.yarn/*
+!.yarn/cache
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/unplugged
+!.yarn/sdks
+!.yarn/versions
+
+data/*

.env.sample

@@ -1,6 +1,17 @@
+######
+# DB #
+######
+
+DB_HOST=db
 DB_PORT=3306
 DB_USERNAME=std_notes_user
 DB_PASSWORD=changeme123
 DB_DATABASE=standard_notes_db
+DB_DEBUG_LEVEL=all
+
+#########
+# CACHE #
+#########
 
 REDIS_PORT=6379
+REDIS_HOST=cache

.github/ci.env

@@ -0,0 +1,21 @@
+PUBLIC_FILES_SERVER_URL=http://localhost:3125
+DB_HOST=db
+DB_USERNAME=std_notes_user
+DB_PASSWORD=changeme123
+DB_DATABASE=standard_notes_db
+REDIS_PORT=6379
+REDIS_HOST=cache
+AUTH_SERVER_ACCESS_TOKEN_AGE=4
+AUTH_SERVER_REFRESH_TOKEN_AGE=10
+AUTH_SERVER_EPHEMERAL_SESSION_AGE=300
+SYNCING_SERVER_REVISIONS_FREQUENCY=5
+AUTH_SERVER_LOG_LEVEL=debug
+SYNCING_SERVER_LOG_LEVEL=debug
+FILES_SERVER_LOG_LEVEL=debug
+REVISIONS_SERVER_LOG_LEVEL=debug
+API_GATEWAY_LOG_LEVEL=debug
+
+MYSQL_DATABASE=standard_notes_db
+MYSQL_USER=std_notes_user
+MYSQL_PASSWORD=changeme123
+MYSQL_ROOT_PASSWORD=changeme123

.github/dependabot.yml

@@ -55,6 +55,11 @@ updates:
     schedule:
       interval: "daily"
 
+  - package-ecosystem: "npm"
+    directory: "/packages/revisions"
+    schedule:
+      interval: "daily"
+
   - package-ecosystem: "npm"
     directory: "/packages/scheduler"
     schedule:
@@ -86,7 +91,7 @@ updates:
       interval: "daily"
 
   - package-ecosystem: "npm"
-    directory: "/packages/workspace"
+    directory: "/packages/websockets"
     schedule:
       interval: "daily"
 

.github/workflows/analytics.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: analytics
       workspace_name: "@standardnotes/analytics"
@@ -22,7 +22,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/api-gateway.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: api-gateway
       workspace_name: "@standardnotes/api-gateway"
-      e2e_tag_parameter_name: api_gateway_image_tag
       deploy_worker: false
       package_path: packages/api-gateway
     secrets: inherit

.github/workflows/auth.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: auth
       workspace_name: "@standardnotes/auth-server"
-      e2e_tag_parameter_name: auth_image_tag
       package_path: packages/auth
     secrets: inherit
 

.github/workflows/common-docker-image.yml

@@ -6,9 +6,6 @@ on:
       service_name:
         required: true
         type: string
-      bundle_dir:
-        required: true
-        type: string
       package_path:
         required: true
         type: string
@@ -32,13 +29,17 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
+    - name: Create Bundle Dir
+      id: bundle-dir
+      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
+
     - name: Cache build
       id: cache-build
       uses: actions/cache@v3
       with:
         path: |
           packages/**/dist
-          ${{ inputs.bundle_dir }}
+          ${{ steps.bundle-dir.outputs.temp_dir }}
         key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -53,7 +54,7 @@ jobs:
 
     - name: Bundle
       if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ inputs.bundle_dir }}
+      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
 
     - name: Login to Docker Hub
       uses: docker/login-action@v2
@@ -85,8 +86,8 @@ jobs:
       uses: docker/build-push-action@v3
       with:
         builder: ${{ steps.buildx.outputs.name }}
-        context: ${{ inputs.bundle_dir }}
-        file: ${{ inputs.bundle_dir }}/${{ inputs.package_path }}/Dockerfile
+        context: ${{ steps.bundle-dir.outputs.temp_dir }}
+        file: ${{ steps.bundle-dir.outputs.temp_dir }}/${{ inputs.package_path }}/Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
         tags: |

.github/workflows/common-e2e.yml

@@ -0,0 +1,46 @@
+name: Reusable Run E2E Test Suite Workflow
+
+on:
+  workflow_call:
+    inputs:
+      snjs_image_tag:
+        type: string
+        default: latest
+        description: The Docker image tag used for SNJS container
+    secrets:
+      DOCKER_USERNAME:
+        required: true
+      DOCKER_PASSWORD:
+        required: true
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+
+jobs:
+  e2e:
+    runs-on: ubuntu-latest
+
+    services:
+      snjs:
+        image: standardnotes/snjs:${{ inputs.snjs_image_tag }}
+        ports:
+        - 9001:9001
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Run Server
+      run: docker compose -f docker-compose.ci.yml up -d
+
+    - name: Wait for server to start
+      run: docker/is-available.sh http://localhost:3123 $(pwd)/logs
+
+    - name: Run E2E Test Suite
+      run: yarn dlx mocha-headless-chrome --timeout 1200000 -f http://localhost:9001/mocha/test.html

.github/workflows/common-self-hosting.yml

@@ -0,0 +1,47 @@
+name: Reusable Publish Docker Self Hosting Image Workflow
+
+on:
+  workflow_call:
+    secrets:
+      DOCKER_USERNAME:
+        required: true
+      DOCKER_PASSWORD:
+        required: true
+      AWS_ACCESS_KEY_ID:
+        required: true
+      AWS_SECRET_ACCESS_KEY:
+        required: true
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@master
+      with:
+        platforms: all
+
+    - name: Set up Docker Buildx
+      id: buildx
+      uses: docker/setup-buildx-action@master
+
+    - name: Publish Docker image
+      uses: docker/build-push-action@v3
+      with:
+        builder: ${{ steps.buildx.outputs.name }}
+        context: .
+        file: Dockerfile
+        platforms: linux/amd64,linux/arm64
+        push: true
+        tags: |
+          standardnotes/server:latest
+          standardnotes/server:${{ github.sha }}

.github/workflows/common-server-application.yml

@@ -17,9 +17,6 @@ on:
         required: false
         default: true
         type: boolean
-      e2e_tag_parameter_name:
-        required: false
-        type: string
       package_path:
         required: true
         type: string
@@ -36,177 +33,11 @@ on:
         required: true
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    outputs:
-      temp_dir: ${{ steps.bundle-dir.outputs.temp_dir }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Create Bundle Dir
-      id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ steps.bundle-dir.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
-
-  lint:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Lint
-      run: yarn lint:${{ inputs.service_name }}
-
-  test:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Test
-      run: yarn test ${{ inputs.package_path }}
-
-  e2e:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ needs.build.outputs.temp_dir }}
-
-    - name: Login to Docker Hub
-      uses: docker/login-action@v2
-      with:
-        username: ${{ secrets.DOCKER_USERNAME }}
-        password: ${{ secrets.DOCKER_PASSWORD }}
-
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@master
-      with:
-        platforms: all
-
-    - name: Set up Docker Buildx
-      id: buildx
-      uses: docker/setup-buildx-action@master
-
-    - name: Publish Docker image for E2E testing
-      uses: docker/build-push-action@v3
-      with:
-        builder: ${{ steps.buildx.outputs.name }}
-        context: ${{ needs.build.outputs.temp_dir }}
-        file: ${{ needs.build.outputs.temp_dir }}/${{ inputs.package_path }}/Dockerfile
-        platforms: linux/amd64,linux/arm64
-        push: true
-        tags: standardnotes/${{ inputs.service_name }}:${{ github.sha }}
-
-    - name: Run E2E test suite
-      uses: convictional/trigger-workflow-and-wait@master
-      with:
-        owner: standardnotes
-        repo: self-hosted
-        github_token: ${{ secrets.CI_PAT_TOKEN }}
-        workflow_file_name: testing-with-updating-client-and-server.yml
-        wait_interval: 30
-        client_payload: '{"${{ inputs.e2e_tag_parameter_name }}": "${{ github.sha }}"}'
-        propagate_failure: true
-        trigger_workflow: true
-        wait_workflow: true
-
   publish:
-    needs: [ build, test, lint, e2e ]
-
     name: Publish Docker Image
     uses: standardnotes/server/.github/workflows/common-docker-image.yml@main
     with:
       service_name: ${{ inputs.service_name }}
-      bundle_dir: ${{ needs.build.outputs.temp_dir }}
       package_path: ${{ inputs.package_path }}
       workspace_name: ${{ inputs.workspace_name }}
     secrets: inherit

.github/workflows/common-server-utility.yml

@@ -1,164 +0,0 @@
-name: Reusable Server Utility Workflow
-
-on:
-  workflow_call:
-    inputs:
-      service_name:
-        required: true
-        type: string
-      workspace_name:
-        required: true
-        type: string
-      deploy_web:
-        required: false
-        default: true
-        type: boolean
-      deploy_worker:
-        required: false
-        default: true
-        type: boolean
-      package_path:
-        required: true
-        type: string
-    secrets:
-      DOCKER_USERNAME:
-        required: true
-      DOCKER_PASSWORD:
-        required: true
-      CI_PAT_TOKEN:
-        required: true
-      AWS_ACCESS_KEY_ID:
-        required: true
-      AWS_SECRET_ACCESS_KEY:
-        required: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    outputs:
-      temp_dir: ${{ steps.bundle-dir.outputs.temp_dir }}
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Create Bundle Dir
-      id: bundle-dir
-      run: echo "temp_dir=$(mktemp -d -t ${{ inputs.service_name }}-${{ github.sha }}-XXXXXXX)" >> $GITHUB_OUTPUT
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ steps.bundle-dir.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Bundle
-      run: yarn workspace ${{ inputs.workspace_name }} bundle --no-compress --output-directory ${{ steps.bundle-dir.outputs.temp_dir }}
-
-  lint:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Lint
-      run: yarn lint:${{ inputs.service_name }}
-
-  test:
-    runs-on: ubuntu-latest
-
-    needs: build
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Cache build
-      id: cache-build
-      uses: actions/cache@v3
-      with:
-        path: |
-          packages/**/dist
-          ${{ needs.build.outputs.temp_dir }}
-        key: ${{ runner.os }}-${{ inputs.service_name }}-build-${{ github.sha }}
-
-    - name: Set up Node
-      uses: actions/setup-node@v3
-      with:
-        registry-url: 'https://registry.npmjs.org'
-        node-version-file: '.nvmrc'
-
-    - name: Build
-      if: steps.cache-build.outputs.cache-hit != 'true'
-      run: yarn build ${{ inputs.package_path }}
-
-    - name: Test
-      run: yarn test ${{ inputs.package_path }}
-
-  publish:
-    needs: [ build, test, lint ]
-
-    name: Publish Docker Image
-    uses: standardnotes/server/.github/workflows/common-docker-image.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}
-      bundle_dir: ${{ needs.build.outputs.temp_dir }}
-      package_path: ${{ inputs.package_path }}
-      workspace_name: ${{ inputs.workspace_name }}
-    secrets: inherit
-
-  deploy-web:
-    if: ${{ inputs.deploy_web }}
-
-    needs: publish
-
-    name: Deploy Web
-    uses: standardnotes/server/.github/workflows/common-deploy.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}
-      docker_image: ${{ inputs.service_name }}:${{ github.sha }}
-    secrets: inherit
-
-  deploy-worker:
-    if: ${{ inputs.deploy_worker }}
-
-    needs: publish
-
-    name: Deploy Worker
-    uses: standardnotes/server/.github/workflows/common-deploy.yml@main
-    with:
-      service_name: ${{ inputs.service_name }}-worker
-      docker_image: ${{ inputs.service_name }}:${{ github.sha }}
-    secrets: inherit

.github/workflows/e2e-test-suite.yml

@@ -0,0 +1,19 @@
+name: E2E Test Suite On Self Hosted Server
+
+on:
+  schedule:
+    - cron: '0 */12 * * *'
+  workflow_dispatch:
+    inputs:
+      snjs_image_tag:
+        type: string
+        default: latest
+        description: The Docker image tag used for SNJS container
+
+jobs:
+  e2e:
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    with:
+      snjs_image_tag: ${{ inputs.snjs_image_tag || 'latest' }}
+    secrets: inherit

.github/workflows/event-store.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: event-store
       workspace_name: "@standardnotes/event-store"
@@ -22,7 +22,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/files.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: files
       workspace_name: "@standardnotes/files-server"
-      e2e_tag_parameter_name: files_image_tag
       package_path: packages/files
     secrets: inherit
 

.github/workflows/pr.yml

@@ -89,18 +89,25 @@ jobs:
       run: yarn test
 
   e2e:
+    needs: build
+
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    secrets: inherit
+
+  legacy_e2e:
+    needs: build
+    name: Legacy E2E
     strategy:
       matrix:
-        application: 
+        application:
           - { "service_name": "api-gateway", "workspace_name": "@standardnotes/api-gateway", "e2e_tag_parameter_name": "api_gateway_image_tag", "package_path": "packages/api-gateway" }
-          - { "service_name": "auth", "workspace_name": "@standardnotes/auth-server", "e2e_tag_parameter_name": "auth_image_tag", "package_path": "packages/auth" }  
+          - { "service_name": "auth", "workspace_name": "@standardnotes/auth-server", "e2e_tag_parameter_name": "auth_image_tag", "package_path": "packages/auth" }
           - { "service_name": "files", "workspace_name": "@standardnotes/files-server", "e2e_tag_parameter_name": "files_image_tag", "package_path": "packages/files" }
           - { "service_name": "revisions", "workspace_name": "@standardnotes/revisions-server", "e2e_tag_parameter_name": "revisions_image_tag", "package_path": "packages/revisions"}
           - { "service_name": "syncing-server-js",  "workspace_name": "@standardnotes/syncing-server", "e2e_tag_parameter_name": "syncing_server_js_image_tag", "package_path": "packages/syncing-server" }
     runs-on: ubuntu-latest
 
-    needs: build
-
     steps:
     - uses: actions/checkout@v3
 
@@ -114,7 +121,7 @@ jobs:
       with:
         path: |
           packages/**/dist
-          ${{ needs.e2e.outputs.temp_dir }}
+          ${{ needs.legacy_e2e.outputs.temp_dir }}
         key: ${{ runner.os }}-build-${{ github.sha }}
 
     - name: Set up Node
@@ -135,12 +142,10 @@ jobs:
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
-
     - name: Set up QEMU
       uses: docker/setup-qemu-action@master
       with:
         platforms: all
-
     - name: Set up Docker Buildx
       id: buildx
       uses: docker/setup-buildx-action@master

.github/workflows/publish.yml

@@ -5,9 +5,106 @@ on:
     branches: [ main ]
 
 jobs:
-  release_and_publish:
+  build:
     if: contains(github.event.head_commit.message, 'chore(release)') == false
     runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Build
+      run: yarn build
+
+  lint:
+    runs-on: ubuntu-latest
+
+    needs: build
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+          ${{ needs.build.outputs.temp_dir }}
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Build
+      if: steps.cache-build.outputs.cache-hit != 'true'
+      run: yarn build
+
+    - name: Lint
+      run: yarn lint
+
+  test:
+    runs-on: ubuntu-latest
+
+    needs: build
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Cache build
+      id: cache-build
+      uses: actions/cache@v3
+      with:
+        path: |
+          packages/**/dist
+          ${{ needs.build.outputs.temp_dir }}
+        key: ${{ runner.os }}-build-${{ github.sha }}
+
+    - name: Set up Node
+      uses: actions/setup-node@v3
+      with:
+        registry-url: 'https://registry.npmjs.org'
+        node-version-file: '.nvmrc'
+
+    - name: Build
+      if: steps.cache-build.outputs.cache-hit != 'true'
+      run: yarn build
+
+    - name: Test
+      run: yarn test
+
+  e2e:
+    needs: build
+    name: E2E
+    uses: standardnotes/server/.github/workflows/common-e2e.yml@main
+    secrets: inherit
+
+  publish-self-hosting:
+    needs: [ test, lint, e2e ]
+    name: Publish Self Hosting Docker Image
+    uses: standardnotes/server/.github/workflows/common-self-hosting.yml@main
+    secrets: inherit
+
+  publish-services:
+    needs: [ test, lint, e2e ]
+
+    runs-on: ubuntu-latest
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -34,7 +131,8 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
           node-version-file: '.nvmrc'
 
-      - name: Build packages
+      - name: Build
+        if: steps.cache-build.outputs.cache-hit != 'true'
         run: yarn build
 
       - name: Bump version
@@ -44,4 +142,3 @@ jobs:
         run: yarn publish
         env:
           NODE_AUTH_TOKEN: ${{ secrets.CI_NPM_TOKEN }}
-

.github/workflows/revisions.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: revisions
       workspace_name: "@standardnotes/revisions-server"
-      e2e_tag_parameter_name: revisions_image_tag
       package_path: packages/revisions
     secrets: inherit
 

.github/workflows/scheduler.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: scheduler
       workspace_name: "@standardnotes/scheduler-server"
@@ -22,7 +22,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
 

.github/workflows/syncing-server.yml

@@ -17,7 +17,6 @@ jobs:
     with:
       service_name: syncing-server-js
       workspace_name: "@standardnotes/syncing-server"
-      e2e_tag_parameter_name: syncing_server_js_image_tag
       package_path: packages/syncing-server
     secrets: inherit
 

.github/workflows/websockets.yml

@@ -11,9 +11,9 @@ on:
   workflow_dispatch:
 
 jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
+  call_server_application_workflow:
+    name: Server Application
+    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
     with:
       service_name: websockets
       workspace_name: "@standardnotes/websockets-server"
@@ -21,7 +21,7 @@ jobs:
     secrets: inherit
 
   newrelic:
-    needs: call_server_utility_workflow
+    needs: call_server_application_workflow
 
     runs-on: ubuntu-latest
     steps:

.github/workflows/workspace.yml

@@ -1,47 +0,0 @@
-name: Workspace Server
-
-concurrency:
-  group: workspace
-  cancel-in-progress: true
-
-on:
-  push:
-    tags:
-      - '*standardnotes/workspace-server*'
-  workflow_dispatch:
-
-jobs:
-  call_server_utility_workflow:
-    name: Server Utility
-    uses: standardnotes/server/.github/workflows/common-server-utility.yml@main
-    with:
-      service_name: workspace
-      workspace_name: "@standardnotes/workspace-server"
-      package_path: packages/workspace
-    secrets: inherit
-
-  newrelic:
-    needs: call_server_utility_workflow
-
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Create New Relic deployment marker for Web
-        uses: newrelic/deployment-marker-action@v1
-        with:
-          accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
-          apiKey: ${{ secrets.NEW_RELIC_API_KEY }}
-          applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_WORKSPACE_WEB_PROD }}
-          revision: "${{ github.sha }}"
-          description: "Automated Deployment via Github Actions"
-          user: "${{ github.actor }}"
-
-      - name: Create New Relic deployment marker for Worker
-        uses: newrelic/deployment-marker-action@v1
-        with:
-          accountId: ${{ secrets.NEW_RELIC_ACCOUNT_ID }}
-          apiKey: ${{ secrets.NEW_RELIC_API_KEY }}
-          applicationId: ${{ secrets.NEW_RELIC_APPLICATION_ID_WORKSPACE_WORKER_PROD }}
-          revision: "${{ github.sha }}"
-          description: "Automated Deployment via Github Actions"
-          user: "${{ github.actor }}"

.gitignore

@@ -20,3 +20,8 @@ packages/files/uploads/*
 
 data/*
 !data/.gitkeep
+
+logs/*
+!logs/.gitkeep
+
+docker-compose.yml

.pnp.cjs

@@ -84,10 +84,6 @@ const RAW_RUNTIME_STATE =
     {\
       "name": "@standardnotes/websockets-server",\
       "reference": "workspace:packages/websockets"\
-    },\
-    {\
-      "name": "@standardnotes/workspace-server",\
-      "reference": "workspace:packages/workspace"\
     }\
   ],\
   "enableTopLevelFallback": true,\
@@ -111,8 +107,7 @@ const RAW_RUNTIME_STATE =
     ["@standardnotes/sncrypto-node", ["workspace:packages/sncrypto-node"]],\
     ["@standardnotes/syncing-server", ["workspace:packages/syncing-server"]],\
     ["@standardnotes/time", ["workspace:packages/time"]],\
-    ["@standardnotes/websockets-server", ["workspace:packages/websockets"]],\
-    ["@standardnotes/workspace-server", ["workspace:packages/workspace"]]\
+    ["@standardnotes/websockets-server", ["workspace:packages/websockets"]]\
   ],\
   "fallbackPool": [\
   ],\
@@ -3965,26 +3960,26 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@simplewebauthn/iso-webcrypto", [\
-      ["npm:7.0.0", {\
-        "packageLocation": "./.yarn/cache/@simplewebauthn-iso-webcrypto-npm-7.0.0-352babf4a0-c1644f9b68.zip/node_modules/@simplewebauthn/iso-webcrypto/",\
+      ["npm:7.0.1", {\
+        "packageLocation": "./.yarn/cache/@simplewebauthn-iso-webcrypto-npm-7.0.1-bae5f6738c-ed506490e0.zip/node_modules/@simplewebauthn/iso-webcrypto/",\
         "packageDependencies": [\
-          ["@simplewebauthn/iso-webcrypto", "npm:7.0.0"]\
+          ["@simplewebauthn/iso-webcrypto", "npm:7.0.1"]\
         ],\
         "linkType": "HARD"\
       }]\
     ]],\
     ["@simplewebauthn/server", [\
-      ["npm:7.0.0", {\
-        "packageLocation": "./.yarn/cache/@simplewebauthn-server-npm-7.0.0-e34589f137-836eb9fb97.zip/node_modules/@simplewebauthn/server/",\
+      ["npm:7.0.1", {\
+        "packageLocation": "./.yarn/cache/@simplewebauthn-server-npm-7.0.1-ac81233d49-d11c708008.zip/node_modules/@simplewebauthn/server/",\
         "packageDependencies": [\
-          ["@simplewebauthn/server", "npm:7.0.0"],\
+          ["@simplewebauthn/server", "npm:7.0.1"],\
           ["@hexagon/base64", "npm:1.1.25"],\
           ["@peculiar/asn1-android", "npm:2.3.3"],\
           ["@peculiar/asn1-ecc", "npm:2.3.4"],\
           ["@peculiar/asn1-rsa", "npm:2.3.4"],\
           ["@peculiar/asn1-schema", "npm:2.3.3"],\
           ["@peculiar/asn1-x509", "npm:2.3.4"],\
-          ["@simplewebauthn/iso-webcrypto", "npm:7.0.0"],\
+          ["@simplewebauthn/iso-webcrypto", "npm:7.0.1"],\
           ["cbor-x", "npm:1.5.0"],\
           ["cross-fetch", "npm:3.1.5"],\
           ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"]\
@@ -4161,7 +4156,7 @@ const RAW_RUNTIME_STATE =
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
           ["@sentry/node", "npm:7.28.1"],\
           ["@sentry/tracing", "npm:7.28.1"],\
-          ["@simplewebauthn/server", "npm:7.0.0"],\
+          ["@simplewebauthn/server", "npm:7.0.1"],\
           ["@simplewebauthn/typescript-types", "npm:7.0.0"],\
           ["@standardnotes/api", "npm:1.24.10"],\
           ["@standardnotes/common", "workspace:packages/common"],\
@@ -4257,8 +4252,6 @@ const RAW_RUNTIME_STATE =
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.48.2"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["reflect-metadata", "npm:0.1.13"],\
-          ["shallow-equal-object", "npm:1.1.1"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
           ["uuid", "npm:9.0.0"]\
@@ -4507,7 +4500,6 @@ const RAW_RUNTIME_STATE =
           ["@types/dotenv", "npm:8.2.0"],\
           ["@types/express", "npm:4.17.14"],\
           ["@types/inversify-express-utils", "npm:2.0.0"],\
-          ["@types/ioredis", "npm:5.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:9.4.0"],\
           ["@typescript-eslint/eslint-plugin", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:5.48.2"],\
@@ -4516,17 +4508,15 @@ const RAW_RUNTIME_STATE =
           ["eslint", "npm:8.32.0"],\
           ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
           ["express", "npm:4.18.2"],\
-          ["helmet", "npm:6.0.0"],\
           ["inversify", "npm:6.0.1"],\
           ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:3.0.1"],\
           ["newrelic", "npm:9.8.0"],\
           ["npm-check-updates", "npm:16.0.1"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
-          ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
+          ["typeorm", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:0.3.10"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
           ["winston", "npm:3.8.2"]\
         ],\
@@ -4691,7 +4681,6 @@ const RAW_RUNTIME_STATE =
           ["@types/dotenv", "npm:8.2.0"],\
           ["@types/express", "npm:4.17.14"],\
           ["@types/inversify-express-utils", "npm:2.0.0"],\
-          ["@types/ioredis", "npm:5.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:9.0.1"],\
           ["@types/newrelic", "npm:9.4.0"],\
@@ -4708,7 +4697,6 @@ const RAW_RUNTIME_STATE =
           ["helmet", "npm:6.0.0"],\
           ["inversify", "npm:6.0.1"],\
           ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.2.4"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:9.0.0"],\
           ["mysql2", "npm:3.0.1"],\
@@ -4718,7 +4706,7 @@ const RAW_RUNTIME_STATE =
           ["prettyjson", "npm:1.2.5"],\
           ["reflect-metadata", "npm:0.1.13"],\
           ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
-          ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
+          ["typeorm", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:0.3.10"],\
           ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
           ["ua-parser-js", "npm:1.0.32"],\
           ["uuid", "npm:9.0.0"],\
@@ -4812,49 +4800,6 @@ const RAW_RUNTIME_STATE =
         "linkType": "SOFT"\
       }]\
     ]],\
-    ["@standardnotes/workspace-server", [\
-      ["workspace:packages/workspace", {\
-        "packageLocation": "./packages/workspace/",\
-        "packageDependencies": [\
-          ["@standardnotes/workspace-server", "workspace:packages/workspace"],\
-          ["@aws-sdk/client-sns", "npm:3.259.0"],\
-          ["@aws-sdk/client-sqs", "npm:3.259.0"],\
-          ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.28.1"],\
-          ["@standardnotes/api", "npm:1.24.10"],\
-          ["@standardnotes/common", "workspace:packages/common"],\
-          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
-          ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
-          ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
-          ["@standardnotes/models", "npm:1.42.11"],\
-          ["@standardnotes/security", "workspace:packages/security"],\
-          ["@standardnotes/time", "workspace:packages/time"],\
-          ["@types/cors", "npm:2.8.12"],\
-          ["@types/express", "npm:4.17.14"],\
-          ["@types/ioredis", "npm:5.0.0"],\
-          ["@types/jest", "npm:29.1.1"],\
-          ["@types/newrelic", "npm:9.4.0"],\
-          ["@typescript-eslint/eslint-plugin", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:5.48.2"],\
-          ["cors", "npm:2.8.5"],\
-          ["dotenv", "npm:16.0.1"],\
-          ["eslint", "npm:8.32.0"],\
-          ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
-          ["express", "npm:4.18.2"],\
-          ["inversify", "npm:6.0.1"],\
-          ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.2.4"],\
-          ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
-          ["mysql2", "npm:3.0.1"],\
-          ["newrelic", "npm:9.8.0"],\
-          ["reflect-metadata", "npm:0.1.13"],\
-          ["ts-jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.0.3"],\
-          ["typeorm", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10"],\
-          ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
-          ["winston", "npm:3.8.2"]\
-        ],\
-        "linkType": "SOFT"\
-      }]\
-    ]],\
     ["@szmarczak/http-timer", [\
       ["npm:5.0.1", {\
         "packageLocation": "./.yarn/cache/@szmarczak-http-timer-npm-5.0.1-52261e5986-67236cba79.zip/node_modules/@szmarczak/http-timer/",\
@@ -13341,15 +13286,6 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
-    ["shallow-equal-object", [\
-      ["npm:1.1.1", {\
-        "packageLocation": "./.yarn/cache/shallow-equal-object-npm-1.1.1-a41b289b2e-9e5e0cd10b.zip/node_modules/shallow-equal-object/",\
-        "packageDependencies": [\
-          ["shallow-equal-object", "npm:1.1.1"]\
-        ],\
-        "linkType": "HARD"\
-      }]\
-    ]],\
     ["shebang-command", [\
       ["npm:2.0.0", {\
         "packageLocation": "./.yarn/cache/shebang-command-npm-2.0.0-eb2b01921d-5907a8d5fa.zip/node_modules/shebang-command/",\
@@ -14489,6 +14425,100 @@ const RAW_RUNTIME_STATE =
         ],\
         "linkType": "SOFT"\
       }],\
+      ["virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:0.3.10", {\
+        "packageLocation": "./.yarn/__virtual__/typeorm-virtual-6480afe6bc/0/cache/typeorm-npm-0.3.10-4667857f33-749e1a6777.zip/node_modules/typeorm/",\
+        "packageDependencies": [\
+          ["typeorm", "virtual:365b8c88cdf194291829ee28b79556e2328175d26a621363e703848100bea0042e9500db2a1206c9bbc3a4a76a1d169639ef774b2ea3a1a98584a9936b58c6be#npm:0.3.10"],\
+          ["@google-cloud/spanner", null],\
+          ["@sap/hana-client", null],\
+          ["@sqltools/formatter", "npm:1.2.5"],\
+          ["@types/better-sqlite3", null],\
+          ["@types/google-cloud__spanner", null],\
+          ["@types/hdb-pool", null],\
+          ["@types/ioredis", null],\
+          ["@types/mongodb", null],\
+          ["@types/mssql", null],\
+          ["@types/mysql2", null],\
+          ["@types/oracledb", null],\
+          ["@types/pg", null],\
+          ["@types/pg-native", null],\
+          ["@types/pg-query-stream", null],\
+          ["@types/redis", null],\
+          ["@types/sap__hana-client", null],\
+          ["@types/sql.js", null],\
+          ["@types/sqlite3", null],\
+          ["@types/ts-node", null],\
+          ["@types/typeorm-aurora-data-api-driver", null],\
+          ["app-root-path", "npm:3.1.0"],\
+          ["better-sqlite3", null],\
+          ["buffer", "npm:6.0.3"],\
+          ["chalk", "npm:4.1.2"],\
+          ["cli-highlight", "npm:2.1.11"],\
+          ["date-fns", "npm:2.29.3"],\
+          ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\
+          ["dotenv", "npm:16.0.3"],\
+          ["glob", "npm:7.2.3"],\
+          ["hdb-pool", null],\
+          ["ioredis", null],\
+          ["js-yaml", "npm:4.1.0"],\
+          ["mkdirp", "npm:1.0.4"],\
+          ["mongodb", null],\
+          ["mssql", null],\
+          ["mysql2", "npm:3.0.1"],\
+          ["oracledb", null],\
+          ["pg", null],\
+          ["pg-native", null],\
+          ["pg-query-stream", null],\
+          ["redis", null],\
+          ["reflect-metadata", "npm:0.1.13"],\
+          ["sha.js", "npm:2.4.11"],\
+          ["sql.js", null],\
+          ["sqlite3", null],\
+          ["ts-node", null],\
+          ["tslib", "npm:2.4.0"],\
+          ["typeorm-aurora-data-api-driver", null],\
+          ["uuid", "npm:8.3.2"],\
+          ["xml2js", "npm:0.4.23"],\
+          ["yargs", "npm:17.5.1"]\
+        ],\
+        "packagePeers": [\
+          "@google-cloud/spanner",\
+          "@sap/hana-client",\
+          "@types/better-sqlite3",\
+          "@types/google-cloud__spanner",\
+          "@types/hdb-pool",\
+          "@types/ioredis",\
+          "@types/mongodb",\
+          "@types/mssql",\
+          "@types/mysql2",\
+          "@types/oracledb",\
+          "@types/pg-native",\
+          "@types/pg-query-stream",\
+          "@types/pg",\
+          "@types/redis",\
+          "@types/sap__hana-client",\
+          "@types/sql.js",\
+          "@types/sqlite3",\
+          "@types/ts-node",\
+          "@types/typeorm-aurora-data-api-driver",\
+          "better-sqlite3",\
+          "hdb-pool",\
+          "ioredis",\
+          "mongodb",\
+          "mssql",\
+          "mysql2",\
+          "oracledb",\
+          "pg-native",\
+          "pg-query-stream",\
+          "pg",\
+          "redis",\
+          "sql.js",\
+          "sqlite3",\
+          "ts-node",\
+          "typeorm-aurora-data-api-driver"\
+        ],\
+        "linkType": "HARD"\
+      }],\
       ["virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:0.3.10", {\
         "packageLocation": "./.yarn/__virtual__/typeorm-virtual-a38286c9d5/0/cache/typeorm-npm-0.3.10-4667857f33-749e1a6777.zip/node_modules/typeorm/",\
         "packageDependencies": [\

.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Makefile

@@ -326,8 +326,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = cd $(srcdir); /Users/karolsojko/workspace/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/karolsojko/Library/Caches/node-gyp/18.13.0" "-Dnode_gyp_dir=/Users/karolsojko/workspace/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp" "-Dnode_lib_file=/Users/karolsojko/Library/Caches/node-gyp/18.13.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/karolsojko/workspace/server/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/karolsojko/workspace/server/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/config.gypi -I/Users/karolsojko/workspace/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/common.gypi "--toplevel-dir=." binding.gyp
-Makefile: $(srcdir)/binding.gyp $(srcdir)/../../../../node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/../../../../../../../../Library/Caches/node-gyp/18.13.0/include/node/common.gypi
+cmd_regen_makefile = cd $(srcdir); /Users/mo/Desktop/sn/dev/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/gyp/gyp_main.py -fmake --ignore-environment "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/mo/Library/Caches/node-gyp/18.13.0" "-Dnode_gyp_dir=/Users/mo/Desktop/sn/dev/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp" "-Dnode_lib_file=/Users/mo/Library/Caches/node-gyp/18.13.0/<(target_arch)/node.lib" "-Dmodule_root_dir=/Users/mo/Desktop/sn/dev/server/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics" "-Dnode_engine=v8" "--depth=." "-Goutput_dir=." "--generator-output=build" -I/Users/mo/Desktop/sn/dev/server/.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/config.gypi -I/Users/mo/Desktop/sn/dev/server/.yarn/unplugged/node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi -I/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/common.gypi "--toplevel-dir=." binding.gyp
+Makefile: $(srcdir)/binding.gyp $(srcdir)/build/config.gypi $(srcdir)/../../../../node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi $(srcdir)/../../../../../../../../../../Library/Caches/node-gyp/18.13.0/include/node/common.gypi
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Release/.deps/Release/native_metrics.node.d

@@ -1 +1 @@
-cmd_Release/native_metrics.node := c++ -bundle -undefined dynamic_lookup -Wl,-search_paths_first -mmacosx-version-min=10.15 -arch x86_64 -L./Release -stdlib=libc++  -o Release/native_metrics.node Release/obj.target/native_metrics/src/native_metrics.o Release/obj.target/native_metrics/src/GCBinder.o Release/obj.target/native_metrics/src/LoopChecker.o 
+cmd_Release/native_metrics.node := c++ -bundle -undefined dynamic_lookup -Wl,-search_paths_first -mmacosx-version-min=10.15 -arch arm64 -L./Release -stdlib=libc++  -o Release/native_metrics.node Release/obj.target/native_metrics/src/native_metrics.o Release/obj.target/native_metrics/src/GCBinder.o Release/obj.target/native_metrics/src/LoopChecker.o 

.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Release/.deps/Release/obj.target/native_metrics/src/GCBinder.o.d

@@ -1,65 +1,65 @@
-cmd_Release/obj.target/native_metrics/src/GCBinder.o := c++ -o Release/obj.target/native_metrics/src/GCBinder.o ../src/GCBinder.cpp '-DNODE_GYP_MODULE_NAME=native_metrics' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNOMINMAX' '-DBUILDING_NODE_EXTENSION' -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/src -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/config -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/uv/include -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/zlib -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.15 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++17 -stdlib=libc++ -fno-rtti -fno-exceptions -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/native_metrics/src/GCBinder.o.d.raw   -c
+cmd_Release/obj.target/native_metrics/src/GCBinder.o := c++ -o Release/obj.target/native_metrics/src/GCBinder.o ../src/GCBinder.cpp '-DNODE_GYP_MODULE_NAME=native_metrics' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNOMINMAX' '-DBUILDING_NODE_EXTENSION' -I/Users/mo/Library/Caches/node-gyp/18.13.0/include/node -I/Users/mo/Library/Caches/node-gyp/18.13.0/src -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/config -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/uv/include -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/zlib -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.15 -arch arm64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++17 -stdlib=libc++ -fno-rtti -fno-exceptions -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/native_metrics/src/GCBinder.o.d.raw   -c
 Release/obj.target/native_metrics/src/GCBinder.o: ../src/GCBinder.cpp \
   ../src/GCBinder.hpp \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8config.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8config.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks_12_inl.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_maybe_43_inl.h \
@@ -78,64 +78,64 @@ Release/obj.target/native_metrics/src/GCBinder.o: ../src/GCBinder.cpp \
 ../src/GCBinder.cpp:
 ../src/GCBinder.hpp:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8config.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8config.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks_12_inl.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_maybe_43_inl.h:

.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Release/.deps/Release/obj.target/native_metrics/src/LoopChecker.o.d

@@ -1,66 +1,66 @@
-cmd_Release/obj.target/native_metrics/src/LoopChecker.o := c++ -o Release/obj.target/native_metrics/src/LoopChecker.o ../src/LoopChecker.cpp '-DNODE_GYP_MODULE_NAME=native_metrics' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNOMINMAX' '-DBUILDING_NODE_EXTENSION' -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/src -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/config -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/uv/include -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/zlib -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.15 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++17 -stdlib=libc++ -fno-rtti -fno-exceptions -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/native_metrics/src/LoopChecker.o.d.raw   -c
+cmd_Release/obj.target/native_metrics/src/LoopChecker.o := c++ -o Release/obj.target/native_metrics/src/LoopChecker.o ../src/LoopChecker.cpp '-DNODE_GYP_MODULE_NAME=native_metrics' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNOMINMAX' '-DBUILDING_NODE_EXTENSION' -I/Users/mo/Library/Caches/node-gyp/18.13.0/include/node -I/Users/mo/Library/Caches/node-gyp/18.13.0/src -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/config -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/uv/include -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/zlib -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.15 -arch arm64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++17 -stdlib=libc++ -fno-rtti -fno-exceptions -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/native_metrics/src/LoopChecker.o.d.raw   -c
 Release/obj.target/native_metrics/src/LoopChecker.o: \
   ../src/LoopChecker.cpp \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h \
   ../src/LoopChecker.hpp \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8config.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8config.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks_12_inl.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_maybe_43_inl.h \
@@ -77,66 +77,66 @@ Release/obj.target/native_metrics/src/LoopChecker.o: \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_scriptorigin.h \
   ../src/Metric.hpp
 ../src/LoopChecker.cpp:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h:
 ../src/LoopChecker.hpp:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8config.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8config.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks_12_inl.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_maybe_43_inl.h:

.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/Release/.deps/Release/obj.target/native_metrics/src/native_metrics.o.d

@@ -1,65 +1,65 @@
-cmd_Release/obj.target/native_metrics/src/native_metrics.o := c++ -o Release/obj.target/native_metrics/src/native_metrics.o ../src/native_metrics.cpp '-DNODE_GYP_MODULE_NAME=native_metrics' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNOMINMAX' '-DBUILDING_NODE_EXTENSION' -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/src -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/config -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/uv/include -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/zlib -I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.15 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++17 -stdlib=libc++ -fno-rtti -fno-exceptions -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/native_metrics/src/native_metrics.o.d.raw   -c
+cmd_Release/obj.target/native_metrics/src/native_metrics.o := c++ -o Release/obj.target/native_metrics/src/native_metrics.o ../src/native_metrics.cpp '-DNODE_GYP_MODULE_NAME=native_metrics' '-DUSING_UV_SHARED=1' '-DUSING_V8_SHARED=1' '-DV8_DEPRECATION_WARNINGS=1' '-DV8_DEPRECATION_WARNINGS' '-DV8_IMMINENT_DEPRECATION_WARNINGS' '-D_GLIBCXX_USE_CXX11_ABI=1' '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DOPENSSL_NO_PINSHARED' '-DOPENSSL_THREADS' '-DNOMINMAX' '-DBUILDING_NODE_EXTENSION' -I/Users/mo/Library/Caches/node-gyp/18.13.0/include/node -I/Users/mo/Library/Caches/node-gyp/18.13.0/src -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/config -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/uv/include -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/zlib -I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.15 -arch arm64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++17 -stdlib=libc++ -fno-rtti -fno-exceptions -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/native_metrics/src/native_metrics.o.d.raw   -c
 Release/obj.target/native_metrics/src/native_metrics.o: \
   ../src/native_metrics.cpp \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8config.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h \
-  /Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8config.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h \
+  /Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks_12_inl.h \
   ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_maybe_43_inl.h \
@@ -77,64 +77,64 @@ Release/obj.target/native_metrics/src/native_metrics.o: \
   ../src/GCBinder.hpp ../src/Metric.hpp ../src/LoopChecker.hpp
 ../src/native_metrics.cpp:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8config.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h:
-/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/errno.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/unix.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/threadpool.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/uv/darwin.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/cppgc/common.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8config.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-array-buffer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-local-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-internal.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-version.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-object.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-maybe.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-persistent-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-weak-callback-info.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-data.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-traced-handle.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-container.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-context.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-snapshot.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-date.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-debug.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-script.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-message.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-exception.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-extension.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-external.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-function-callback.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-template.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-memory-span.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-initialization.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-callbacks.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-isolate.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-heap.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-statistics.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-promise.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-unwinder.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-embedder-state-scope.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-platform.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-json.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-locker.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-microtask-queue.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-primitive-object.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-proxy.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-regexp.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-typed-array.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-value-serializer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/v8-wasm.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_buffer.h:
+/Users/mo/Library/Caches/node-gyp/18.13.0/include/node/node_object_wrap.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_callbacks_12_inl.h:
 ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_maybe_43_inl.h:

.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/config.gypi

@@ -5,9 +5,12 @@
     "default_configuration": "Release",
     "defines": [],
     "include_dirs": [],
-    "libraries": []
+    "libraries": [],
+    "msvs_configuration_platform": "ARM64",
+    "xcode_configuration_platform": "arm64"
   },
   "variables": {
+    "arm_fpu": "neon",
     "asan": 0,
     "coverage": "false",
     "dcheck_always_on": 0,
@@ -18,7 +21,7 @@
     "enable_pgo_use": "false",
     "error_on_warn": "false",
     "force_dynamic_crt": 0,
-    "host_arch": "x64",
+    "host_arch": "arm64",
     "icu_data_in": "../../deps/icu-tmp/icudt72l.dat",
     "icu_endianness": "l",
     "icu_gyp_path": "tools/icu/icu-generic.gyp",
@@ -27,7 +30,7 @@
     "icu_ver_major": "72",
     "is_debug": 0,
     "libdir": "lib",
-    "llvm_version": "11.0",
+    "llvm_version": "12.0",
     "napi_build_version": "8",
     "node_builtin_shareable_builtins": [
       "deps/cjs-module-lexer/lexer.js",
@@ -371,7 +374,7 @@
     "openssl_quic": "true",
     "ossfuzz": "false",
     "shlib_suffix": "108.dylib",
-    "target_arch": "x64",
+    "target_arch": "arm64",
     "v8_enable_31bit_smis_on_64bit_arch": 0,
     "v8_enable_gdbjit": 0,
     "v8_enable_hugepage": 0,
@@ -382,7 +385,6 @@
     "v8_enable_object_print": 1,
     "v8_enable_pointer_compression": 0,
     "v8_enable_shared_ro_heap": 1,
-    "v8_enable_short_builtin_calls": 1,
     "v8_enable_webassembly": 1,
     "v8_no_strict_aliasing": 1,
     "v8_optimized_debug": 1,
@@ -391,9 +393,9 @@
     "v8_trace_maps": 0,
     "v8_use_siphash": 1,
     "want_separate_host_toolset": 0,
-    "xcode_version": "11.0",
-    "nodedir": "/Users/karolsojko/Library/Caches/node-gyp/18.13.0",
+    "xcode_version": "12.0",
+    "nodedir": "/Users/mo/Library/Caches/node-gyp/18.13.0",
     "standalone_static_library": 1,
-    "user_agent": "yarn/4.0.0-rc.25 npm/? node/v18.13.0 darwin x64"
+    "user_agent": "yarn/4.0.0-rc.25 npm/? node/v18.13.0 darwin arm64"
   }
 }

.yarn/unplugged/@newrelic-native-metrics-npm-9.0.0-590d2e713a/node_modules/@newrelic/native-metrics/build/native_metrics.target.mk

@@ -26,7 +26,7 @@ CFLAGS_Debug := \
 	-O0 \
 	-gdwarf-2 \
 	-mmacosx-version-min=10.15 \
-	-arch x86_64 \
+	-arch arm64 \
 	-Wall \
 	-Wendif-labels \
 	-W \
@@ -51,13 +51,13 @@ CFLAGS_OBJC_Debug :=
 CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/src \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/config \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/uv/include \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/zlib \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/v8/include \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/include/node \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/src \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/config \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/uv/include \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/zlib \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/v8/include \
 	-I$(srcdir)/src \
 	-I$(srcdir)/../../../../nan-npm-2.16.0-cac314a230/node_modules/nan
 
@@ -82,7 +82,7 @@ CFLAGS_Release := \
 	-O3 \
 	-gdwarf-2 \
 	-mmacosx-version-min=10.15 \
-	-arch x86_64 \
+	-arch arm64 \
 	-Wall \
 	-Wendif-labels \
 	-W \
@@ -107,13 +107,13 @@ CFLAGS_OBJC_Release :=
 CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/include/node \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/src \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/config \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/uv/include \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/zlib \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.13.0/deps/v8/include \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/include/node \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/src \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/config \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/openssl/openssl/include \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/uv/include \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/zlib \
+	-I/Users/mo/Library/Caches/node-gyp/18.13.0/deps/v8/include \
 	-I$(srcdir)/src \
 	-I$(srcdir)/../../../../nan-npm-2.16.0-cac314a230/node_modules/nan
 
@@ -152,7 +152,7 @@ LDFLAGS_Debug := \
 	-undefined dynamic_lookup \
 	-Wl,-search_paths_first \
 	-mmacosx-version-min=10.15 \
-	-arch x86_64 \
+	-arch arm64 \
 	-L$(builddir) \
 	-stdlib=libc++
 
@@ -164,7 +164,7 @@ LDFLAGS_Release := \
 	-undefined dynamic_lookup \
 	-Wl,-search_paths_first \
 	-mmacosx-version-min=10.15 \
-	-arch x86_64 \
+	-arch arm64 \
 	-L$(builddir) \
 	-stdlib=libc++
 

Dockerfile

@@ -0,0 +1,47 @@
+FROM node:18.13.0-alpine
+
+ENV NODE_ENV production
+
+RUN apk add --update --no-cache \
+  openssl \
+  curl \
+  bash \
+  py3-pip
+
+RUN pip install --no-cache-dir --upgrade supervisor
+
+RUN mkdir -p /var/lib/server/logs
+
+COPY docker/supervisord.conf /etc/supervisord.conf
+
+COPY docker/docker-entrypoint.sh /usr/local/bin/
+
+COPY . /opt/server
+
+WORKDIR /opt/server
+
+RUN corepack enable
+
+RUN yarn install --immutable
+
+RUN CI=true yarn build
+
+RUN mkdir -p \
+  /opt/bundled/syncing-server \
+  /opt/bundled/auth \
+  /opt/bundled/files \
+  /opt/bundled/revisions \
+  /opt/bundled/api-gateway \
+  /opt/shared/uploads
+
+RUN yarn workspace @standardnotes/syncing-server bundle --no-compress --output-directory /opt/bundled/syncing-server
+RUN yarn workspace @standardnotes/auth-server bundle --no-compress --output-directory /opt/bundled/auth
+RUN yarn workspace @standardnotes/files-server bundle --no-compress --output-directory /opt/bundled/files
+RUN yarn workspace @standardnotes/revisions-server bundle --no-compress --output-directory /opt/bundled/revisions
+RUN yarn workspace @standardnotes/api-gateway bundle --no-compress --output-directory /opt/bundled/api-gateway
+
+WORKDIR /opt/bundled
+
+RUN rm -rf /opt/server
+
+ENTRYPOINT ["docker-entrypoint.sh"]

docker-compose.ci.yml

@@ -0,0 +1,74 @@
+services:
+  mock-event-publisher:
+    image: standardnotes/mock-event-publisher
+    ports:
+    - 3124:3000
+    environment:
+      LOG_LEVEL: debug
+      NODE_ENV: production
+      VERSION: snjs-test
+      SNS_TOPIC_ARN: arn:aws:sns:us-east-1:000000000000:payments-local-topic
+      SNS_ENDPOINT: http://localstack:4566
+      SNS_DISABLE_SSL: true
+      SNS_SECRET_ACCESS_KEY: x
+      SNS_ACCESS_KEY_ID: x
+      SNS_AWS_REGION: us-east-1
+      NEW_RELIC_ENABLED: false
+    networks:
+      - standardnotes_self_hosted
+
+  server:
+    build: .
+    env_file: .github/ci.env
+    container_name: server-ci
+    ports:
+      - 3123:3000
+      - 3125:3104
+    volumes:
+      - ./logs:/var/lib/server/logs
+    networks:
+      - standardnotes_self_hosted
+
+  localstack:
+    image: localstack/localstack:1.3
+    container_name: localstack-ci
+    expose:
+      - 4566
+    restart: unless-stopped
+    environment:
+      - SERVICES=sns,sqs
+      - HOSTNAME_EXTERNAL=localstack
+      - LS_LOG=warn
+    volumes:
+      - ./docker/localstack_bootstrap.sh:/etc/localstack/init/ready.d/localstack_bootstrap.sh
+    networks:
+      - standardnotes_self_hosted
+
+  db:
+    image: mysql:8
+    container_name: db-ci
+    env_file: .github/ci.env
+    expose:
+      - 3306
+    restart: unless-stopped
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+      - ./data/import:/docker-entrypoint-initdb.d
+    networks:
+      - standardnotes_self_hosted
+
+  cache:
+    image: redis:6.0-alpine
+    container_name: cache-ci
+    volumes:
+      - ./data/redis/:/data
+    expose:
+      - 6379
+    restart: unless-stopped
+    networks:
+      - standardnotes_self_hosted
+
+networks:
+  standardnotes_self_hosted:
+    name: standardnotes_self_hosted

docker-compose.example.yml

@@ -0,0 +1,61 @@
+services:
+  server:
+    image: standardnotes/server
+    env_file: .env
+    container_name: server_self_hosted
+    ports:
+      - 3000:3000
+      - 3125:3104
+    volumes:
+      - ./logs:/var/lib/server/logs
+      - ./uploads:/opt/bundled/files/packages/files/dist/uploads
+    networks:
+      - standardnotes_self_hosted
+
+  localstack:
+    image: localstack/localstack:1.3
+    container_name: localstack_self_hosted
+    expose:
+      - 4566
+    restart: unless-stopped
+    environment:
+      - SERVICES=sns,sqs
+      - HOSTNAME_EXTERNAL=localstack
+      - LS_LOG=warn
+    volumes:
+      - ./localstack_bootstrap.sh:/etc/localstack/init/ready.d/localstack_bootstrap.sh
+    networks:
+      - standardnotes_self_hosted
+
+  db:
+    image: mysql:8
+    container_name: db_self_hosted
+    environment:
+      - MYSQL_DATABASE=standard_notes_db
+      - MYSQL_USER=std_notes_user
+      - MYSQL_ROOT_PASSWORD=changeme123
+      - MYSQL_PASSWORD=changeme123
+    expose:
+      - 3306
+    restart: unless-stopped
+    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci
+    volumes:
+      - ./data/mysql:/var/lib/mysql
+      - ./data/import:/docker-entrypoint-initdb.d
+    networks:
+      - standardnotes_self_hosted
+
+  cache:
+    image: redis:6.0-alpine
+    container_name: cache_self_hosted
+    volumes:
+      - ./data/redis/:/data
+    expose:
+      - 6379
+    restart: unless-stopped
+    networks:
+      - standardnotes_self_hosted
+
+networks:
+  standardnotes_self_hosted:
+    name: standardnotes_self_hosted

docker-compose.yml

@@ -1,24 +0,0 @@
-version: '3.8'
-services:
-  db:
-    image: mysql:5.6
-    environment:
-      MYSQL_DATABASE: '${DB_DATABASE}'
-      MYSQL_USER: '${DB_USERNAME}'
-      MYSQL_PASSWORD: '${DB_PASSWORD}'
-      MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
-    expose:
-      - ${DB_PORT}:3306
-    restart: unless-stopped
-    command: --default-authentication-plugin=mysql_native_password --character-set-server=utf8 --collation-server=utf8_general_ci
-    volumes:
-      - ./data/mysql:/var/lib/mysql
-      - ./data/import:/docker-entrypoint-initdb.d
-
-  cache:
-    image: redis:6.0-alpine
-    volumes:
-      - ./data/redis/:/data
-    expose:
-      - ${REDIS_PORT}:6379
-    restart: unless-stopped

docker/docker-entrypoint.sh

@@ -0,0 +1,364 @@
+#!/bin/bash
+
+# Setup environment variables
+
+#########
+# PORTS #
+#########
+
+export API_GATEWAY_PORT=3000
+
+if [ -z "$SYNCING_SERVER_PORT" ]; then
+  export SYNCING_SERVER_PORT=3101
+fi
+
+if [ -z "$AUTH_SERVER_PORT" ]; then
+  export AUTH_SERVER_PORT=3103
+fi
+
+export FILES_SERVER_PORT=3104
+
+if [ -z "$REVISIONS_SERVER_PORT" ]; then
+  export REVISIONS_SERVER_PORT=3105
+fi
+
+######
+# DB #
+######
+
+if [ -z "$DB_HOST" ]; then
+  export DB_HOST="db"
+fi
+if [ -z "$DB_PORT" ]; then
+  export DB_PORT="3306"
+fi
+if [ -z "$DB_USERNAME" ]; then
+  export DB_USERNAME="std_notes_user"
+fi
+if [ -z "$DB_PASSWORD" ]; then
+  export DB_PASSWORD=$(openssl rand -hex 32)
+fi
+if [ -z "$DB_DATABASE" ]; then
+  export DB_DATABASE="standard_notes_db"
+fi
+if [ -z "$DB_DEBUG_LEVEL" ]; then
+  export DB_DEBUG_LEVEL="all"
+fi
+export DB_MIGRATIONS_PATH="dist/migrations/*.js"
+
+#########
+# CACHE #
+#########
+
+if [ -z "$REDIS_PORT" ]; then
+  export REDIS_PORT=6379
+fi
+
+if [ -z "$REDIS_HOST" ]; then
+  export REDIS_HOST="cache"
+fi
+
+export REDIS_URL="redis://$REDIS_HOST"
+
+##########
+# SHARED #
+##########
+
+if [ -z "$AUTH_JWT_SECRET" ]; then
+  export AUTH_JWT_SECRET=$(openssl rand -hex 32)
+fi
+
+if [ -z "$VALET_TOKEN_SECRET" ]; then
+  export VALET_TOKEN_SECRET=$(openssl rand -base64 32)
+fi
+
+########
+# AUTH #
+########
+
+if [ -z "$AUTH_SERVER_LOG_LEVEL" ]; then
+  export AUTH_SERVER_LOG_LEVEL="info"
+fi
+export AUTH_SERVER_NODE_ENV="production"
+export AUTH_SERVER_VERSION="local"
+
+if [ -z "$AUTH_SERVER_AUTH_JWT_TTL" ]; then
+  export AUTH_SERVER_AUTH_JWT_TTL=60000
+fi
+
+export AUTH_SERVER_JWT_SECRET=$AUTH_JWT_SECRET
+export AUTH_SERVER_LEGACY_JWT_SECRET=$(openssl rand -hex 32)
+
+export AUTH_SERVER_NEW_RELIC_ENABLED=false
+export AUTH_SERVER_NEW_RELIC_APP_NAME=Auth
+export AUTH_SERVER_NEW_RELIC_NO_CONFIG_FILE=true
+
+if [ -z "$AUTH_SERVER_DISABLE_USER_REGISTRATION" ]; then
+  export AUTH_SERVER_DISABLE_USER_REGISTRATION=false
+fi
+
+if [ -z "$AUTH_SERVER_PSEUDO_KEY_PARAMS_KEY" ]; then
+  export AUTH_SERVER_PSEUDO_KEY_PARAMS_KEY=$(openssl rand -hex 32)
+fi
+
+if [ -z "$AUTH_SERVER_ACCESS_TOKEN_AGE" ]; then
+  export AUTH_SERVER_ACCESS_TOKEN_AGE=5184000
+fi
+if [ -z "$AUTH_SERVER_REFRESH_TOKEN_AGE" ]; then
+  export AUTH_SERVER_REFRESH_TOKEN_AGE=31556926
+fi
+
+if [ -z "$AUTH_SERVER_MAX_LOGIN_ATTEMPTS" ]; then
+  export AUTH_SERVER_MAX_LOGIN_ATTEMPTS=6
+fi
+if [ -z "$AUTH_SERVER_FAILED_LOGIN_LOCKOUT" ]; then
+  export AUTH_SERVER_FAILED_LOGIN_LOCKOUT=3600
+fi
+
+if [ -z "$AUTH_SERVER_EPHEMERAL_SESSION_AGE" ]; then
+  export AUTH_SERVER_EPHEMERAL_SESSION_AGE=259200
+fi
+
+if [ -z "$AUTH_SERVER_ENCRYPTION_SERVER_KEY" ]; then
+  export AUTH_SERVER_ENCRYPTION_SERVER_KEY=$(openssl rand -hex 32)
+fi
+
+export AUTH_SERVER_SYNCING_SERVER_URL=http://localhost:$SYNCING_SERVER_PORT
+
+# File Uploads
+if [ -z "$AUTH_SERVER_VALET_TOKEN_TTL" ]; then
+  export AUTH_SERVER_VALET_TOKEN_TTL=7200
+fi
+
+# Localstack Setup
+if [ -z "$AUTH_SERVER_SNS_TOPIC_ARN" ]; then
+  export AUTH_SERVER_SNS_TOPIC_ARN="arn:aws:sns:us-east-1:000000000000:auth-local-topic"
+fi
+if [ -z "$AUTH_SERVER_SNS_ENDPOINT" ]; then
+  export AUTH_SERVER_SNS_ENDPOINT="http://localstack:4566"
+fi
+if [ -z "$AUTH_SERVER_SNS_SECRET_ACCESS_KEY" ]; then
+  export AUTH_SERVER_SNS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$AUTH_SERVER_SNS_ACCESS_KEY_ID" ]; then
+  export AUTH_SERVER_SNS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$AUTH_SERVER_SNS_AWS_REGION" ]; then
+  export AUTH_SERVER_SNS_AWS_REGION="us-east-1"
+fi
+if [ -z "$AUTH_SERVER_SQS_QUEUE_URL" ]; then
+  export AUTH_SERVER_SQS_QUEUE_URL="http://localstack:4566/000000000000/auth-local-queue"
+fi
+if [ -z "$AUTH_SERVER_SQS_AWS_REGION" ]; then
+  export AUTH_SERVER_SQS_AWS_REGION="us-east-1"
+fi
+if [ -z "$AUTH_SERVER_SQS_ACCESS_KEY_ID" ]; then
+  export AUTH_SERVER_SQS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$AUTH_SERVER_SQS_SECRET_ACCESS_KEY" ]; then
+  export AUTH_SERVER_SQS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$AUTH_SERVER_SQS_ENDPOINT" ]; then
+  export AUTH_SERVER_SQS_ENDPOINT="http://localstack:4566"
+fi
+
+# U2F Setup
+if [ -z "$AUTH_SERVER_U2F_RELYING_PARTY_ID" ]; then
+  export AUTH_SERVER_U2F_RELYING_PARTY_ID="localhost"
+fi
+if [ -z "$AUTH_SERVER_U2F_RELYING_PARTY_NAME" ]; then
+  export AUTH_SERVER_U2F_RELYING_PARTY_NAME="Standard Notes"
+fi
+if [ -z "$AUTH_SERVER_U2F_EXPECTED_ORIGIN" ]; then
+  export AUTH_SERVER_U2F_EXPECTED_ORIGIN="http://localhost,http://localhost:3001"
+fi
+if [ -z "$AUTH_SERVER_U2F_REQUIRE_USER_VERIFICATION" ]; then
+  export AUTH_SERVER_U2F_REQUIRE_USER_VERIFICATION=false
+fi
+
+printenv | grep AUTH_SERVER_ | sed 's/AUTH_SERVER_//g' > /opt/bundled/auth/packages/auth/.env
+
+##################
+# SYNCING SERVER #
+##################
+
+if [ -z "$SYNCING_SERVER_LOG_LEVEL" ]; then
+  export SYNCING_SERVER_LOG_LEVEL="info"
+fi
+export SYNCING_SERVER_NODE_ENV=production
+export SYNCING_SERVER_VERSION=local
+
+if [ -z "$SYNCING_SERVER_SNS_TOPIC_ARN" ]; then
+  export SYNCING_SERVER_SNS_TOPIC_ARN="arn:aws:sns:us-east-1:000000000000:syncing-server-local-topic"
+fi
+if [ -z "$SYNCING_SERVER_SNS_ENDPOINT" ]; then
+  export SYNCING_SERVER_SNS_ENDPOINT="http://localstack:4566"
+fi
+if [ -z "$SYNCING_SERVER_SNS_SECRET_ACCESS_KEY" ]; then
+  export SYNCING_SERVER_SNS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$SYNCING_SERVER_SNS_ACCESS_KEY_ID" ]; then
+  export SYNCING_SERVER_SNS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$SYNCING_SERVER_SNS_AWS_REGION" ]; then
+  export SYNCING_SERVER_SNS_AWS_REGION="us-east-1"
+fi
+if [ -z "$SYNCING_SERVER_SQS_QUEUE_URL" ]; then
+  export SYNCING_SERVER_SQS_QUEUE_URL="http://localstack:4566/000000000000/syncing-server-local-queue"
+fi
+if [ -z "$SYNCING_SERVER_SQS_AWS_REGION" ]; then
+  export SYNCING_SERVER_SQS_AWS_REGION="us-east-1"
+fi
+if [ -z "$SYNCING_SERVER_SQS_ACCESS_KEY_ID" ]; then
+  export SYNCING_SERVER_SQS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$SYNCING_SERVER_SQS_SECRET_ACCESS_KEY" ]; then
+  export SYNCING_SERVER_SQS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$SYNCING_SERVER_SQS_ENDPOINT" ]; then
+  export SYNCING_SERVER_SQS_ENDPOINT="http://localstack:4566"
+fi
+
+export SYNCING_SERVER_AUTH_SERVER_URL=http://localhost:$AUTH_SERVER_PORT
+
+if [ -z "$SYNCING_SERVER_EMAIL_ATTACHMENT_MAX_BYTE_SIZE" ]; then
+  export SYNCING_SERVER_EMAIL_ATTACHMENT_MAX_BYTE_SIZE=10485760
+fi
+
+if [ -z "$SYNCING_SERVER_REVISIONS_FREQUENCY" ]; then
+  export SYNCING_SERVER_REVISIONS_FREQUENCY=300
+fi
+
+export SYNCING_SERVER_NEW_RELIC_ENABLED=false
+export SYNCING_SERVER_NEW_RELIC_APP_NAME="Syncing Server JS"
+export SYNCING_SERVER_NEW_RELIC_NO_CONFIG_FILE=true
+
+export SYNCING_SERVER_FILE_UPLOAD_PATH="/opt/shared/uploads"
+
+printenv | grep SYNCING_SERVER_ | sed 's/SYNCING_SERVER_//g' > /opt/bundled/syncing-server/packages/syncing-server/.env
+
+
+################
+# FILES SERVER #
+################
+
+if [ -z "$FILES_SERVER_LOG_LEVEL" ]; then
+  export FILES_SERVER_LOG_LEVEL="info"
+fi
+export FILES_SERVER_NODE_ENV="production"
+export FILES_SERVER_VERSION="local"
+
+if [ -z "$FILES_SERVER_MAX_CHUNK_BYTES" ]; then
+  export FILES_SERVER_MAX_CHUNK_BYTES=100000000
+fi
+
+export FILES_SERVER_NEW_RELIC_ENABLED=false
+
+if [ -z "$FILES_SERVER_SNS_TOPIC_ARN" ]; then
+  export FILES_SERVER_SNS_TOPIC_ARN="arn:aws:sns:us-east-1:000000000000:files-local-topic"
+fi
+if [ -z "$FILES_SERVER_SNS_ENDPOINT" ]; then
+  export FILES_SERVER_SNS_ENDPOINT="http://localstack:4566"
+fi
+if [ -z "$FILES_SERVER_SNS_SECRET_ACCESS_KEY" ]; then
+  export FILES_SERVER_SNS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$FILES_SERVER_SNS_ACCESS_KEY_ID" ]; then
+  export FILES_SERVER_SNS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$FILES_SERVER_SNS_AWS_REGION" ]; then
+  export FILES_SERVER_SNS_AWS_REGION="us-east-1"
+fi
+if [ -z "$FILES_SERVER_SQS_QUEUE_URL" ]; then
+  export FILES_SERVER_SQS_QUEUE_URL="http://localstack:4566/000000000000/files-local-queue"
+fi
+if [ -z "$FILES_SERVER_SQS_AWS_REGION" ]; then
+  export FILES_SERVER_SQS_AWS_REGION="us-east-1"
+fi
+if [ -z "$FILES_SERVER_SQS_ACCESS_KEY_ID" ]; then
+  export FILES_SERVER_SQS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$FILES_SERVER_SQS_SECRET_ACCESS_KEY" ]; then
+  export FILES_SERVER_SQS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$FILES_SERVER_SQS_ENDPOINT" ]; then
+  export FILES_SERVER_SQS_ENDPOINT="http://localstack:4566"
+fi
+
+printenv | grep FILES_SERVER_ | sed 's/FILES_SERVER_//g' > /opt/bundled/files/packages/files/.env
+
+#############
+# REVISIONS #
+#############
+
+if [ -z "$REVISIONS_SERVER_LOG_LEVEL" ]; then
+  export REVISIONS_SERVER_LOG_LEVEL="info"
+fi
+
+export REVISIONS_SERVER_NODE_ENV="production"
+export REVISIONS_SERVER_VERSION="local"
+
+export REVISIONS_SERVER_NEW_RELIC_ENABLED=false
+
+if [ -z "$REVISIONS_SERVER_SNS_TOPIC_ARN" ]; then
+  export REVISIONS_SERVER_SNS_TOPIC_ARN="arn:aws:sns:us-east-1:000000000000:revisions-server-local-topic"
+fi
+if [ -z "$REVISIONS_SERVER_SNS_ENDPOINT" ]; then
+  export REVISIONS_SERVER_SNS_ENDPOINT="http://localstack:4566"
+fi
+if [ -z "$REVISIONS_SERVER_SNS_SECRET_ACCESS_KEY" ]; then
+  export REVISIONS_SERVER_SNS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$REVISIONS_SERVER_SNS_ACCESS_KEY_ID" ]; then
+  export REVISIONS_SERVER_SNS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$REVISIONS_SERVER_SNS_AWS_REGION" ]; then
+  export REVISIONS_SERVER_SNS_AWS_REGION="us-east-1"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_QUEUE_URL" ]; then
+  export REVISIONS_SERVER_SQS_QUEUE_URL="http://localstack:4566/000000000000/revisions-server-local-queue"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_AWS_REGION" ]; then
+  export REVISIONS_SERVER_SQS_AWS_REGION="us-east-1"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_ACCESS_KEY_ID" ]; then
+  export REVISIONS_SERVER_SQS_ACCESS_KEY_ID="x"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_SECRET_ACCESS_KEY" ]; then
+  export REVISIONS_SERVER_SQS_SECRET_ACCESS_KEY="x"
+fi
+if [ -z "$REVISIONS_SERVER_SQS_ENDPOINT" ]; then
+  export REVISIONS_SERVER_SQS_ENDPOINT="http://localstack:4566"
+fi
+
+printenv | grep REVISIONS_SERVER_ | sed 's/REVISIONS_SERVER_//g' > /opt/bundled/revisions/packages/revisions/.env
+
+###############
+# API GATEWAY #
+###############
+
+if [ -z "$API_GATEWAY_LOG_LEVEL" ]; then
+  export API_GATEWAY_LOG_LEVEL="info"
+fi
+export API_GATEWAY_NODE_ENV=production
+export API_GATEWAY_VERSION=local
+
+export API_GATEWAY_NEW_RELIC_ENABLED=false
+export API_GATEWAY_NEW_RELIC_APP_NAME="API Gateway"
+export API_GATEWAY_NEW_RELIC_NO_CONFIG_FILE=true
+
+export API_GATEWAY_SYNCING_SERVER_JS_URL=http://localhost:$SYNCING_SERVER_PORT
+export API_GATEWAY_AUTH_SERVER_URL=http://localhost:$AUTH_SERVER_PORT
+export API_GATEWAY_REVISIONS_SERVER_URL=http://localhost:3005
+if [ -z "$PUBLIC_FILES_SERVER_URL" ]; then
+  export PUBLIC_FILES_SERVER_URL=http://localhost:3125
+fi
+export API_GATEWAY_FILES_SERVER_URL=$PUBLIC_FILES_SERVER_URL
+
+printenv | grep API_GATEWAY_ | sed 's/API_GATEWAY_//g' > /opt/bundled/api-gateway/packages/api-gateway/.env
+
+# Run supervisor
+
+supervisord -c /etc/supervisord.conf
+
+exec "$@"

docker/is-available.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+
+WAIT_FOR_URL="$1"
+shift
+LOGS_PATH="$1"
+shift
+
+attempt=0
+while [ $attempt -le 120 ]; do
+    attempt=$(( $attempt + 1 ))
+    echo "# Waiting for all services to be up (attempt: $attempt) ..."
+    ping_api_gateway_result=`curl -s $WAIT_FOR_URL | grep "Welcome"`
+    if [ "$?" -eq "0" ]; then
+        sleep 2 # for warmup
+        echo "# All services are up!"
+        exit 0
+        break
+    fi
+    sleep 2
+done
+
+echo "# Failed to wait for all services to be up!"
+
+echo "# Errors:"
+tail -n 50 $LOGS_PATH/*.err
+
+echo "# Logs:"
+tail -n 50 $LOGS_PATH/*.log
+
+exit 1

docker/localstack_bootstrap.sh

@@ -0,0 +1,182 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo "configuring sns/sqs"
+echo "==================="
+LOCALSTACK_HOST=localhost
+AWS_REGION=us-east-1
+LOCALSTACK_DUMMY_ID=000000000000
+
+get_all_queues() {
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sqs list-queues
+}
+
+create_queue() {
+  local QUEUE_NAME_TO_CREATE=$1
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sqs create-queue --queue-name ${QUEUE_NAME_TO_CREATE}
+}
+
+get_all_topics() {
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sns list-topics
+}
+
+create_topic() {
+  local TOPIC_NAME_TO_CREATE=$1
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sns create-topic --name ${TOPIC_NAME_TO_CREATE}
+}
+
+link_queue_and_topic() {
+  local TOPIC_ARN_TO_LINK=$1
+  local QUEUE_ARN_TO_LINK=$2
+  awslocal --endpoint-url=http://${LOCALSTACK_HOST}:4566 sns subscribe --topic-arn ${TOPIC_ARN_TO_LINK} --protocol sqs --notification-endpoint ${QUEUE_ARN_TO_LINK}
+}
+
+get_queue_arn_from_name() {
+  local QUEUE_NAME=$1
+  echo "arn:aws:sns:${AWS_REGION}:${LOCALSTACK_DUMMY_ID}:$QUEUE_NAME"
+}
+
+get_topic_arn_from_name() {
+  local TOPIC_NAME=$1
+  echo "arn:aws:sns:${AWS_REGION}:${LOCALSTACK_DUMMY_ID}:$TOPIC_NAME"
+}
+
+PAYMENTS_TOPIC_NAME="payments-local-topic"
+
+echo "creating topic $PAYMENTS_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${PAYMENTS_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+PAYMENTS_TOPIC_ARN=$(get_topic_arn_from_name $PAYMENTS_TOPIC_NAME)
+
+SYNCING_SERVER_TOPIC_NAME="syncing-server-local-topic"
+
+echo "creating topic $SYNCING_SERVER_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${SYNCING_SERVER_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+SYNCING_SERVER_TOPIC_ARN=$(get_topic_arn_from_name $SYNCING_SERVER_TOPIC_NAME)
+
+AUTH_TOPIC_NAME="auth-local-topic"
+
+echo "creating topic $AUTH_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${AUTH_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+AUTH_TOPIC_ARN=$(get_topic_arn_from_name $AUTH_TOPIC_NAME)
+
+FILES_TOPIC_NAME="files-local-topic"
+
+echo "creating topic $FILES_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${FILES_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+FILES_TOPIC_ARN=$(get_topic_arn_from_name $FILES_TOPIC_NAME)
+
+ANALYTICS_TOPIC_NAME="analytics-local-topic"
+
+echo "creating topic $ANALYTICS_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${ANALYTICS_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+ANALYTICS_TOPIC_ARN=$(get_topic_arn_from_name $ANALYTICS_TOPIC_NAME)
+
+REVISIONS_TOPIC_NAME="revisions-server-local-topic"
+
+echo "creating topic $REVISIONS_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${REVISIONS_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+REVISIONS_TOPIC_ARN=$(get_topic_arn_from_name $REVISIONS_TOPIC_NAME)
+
+SCHEDULER_TOPIC_NAME="scheduler-local-topic"
+
+echo "creating topic $SCHEDULER_TOPIC_NAME"
+TOPIC_CREATED_RESULT=$(create_topic ${SCHEDULER_TOPIC_NAME})
+echo "created topic: $TOPIC_CREATED_RESULT"
+SCHEDULER_TOPIC_ARN=$(get_topic_arn_from_name $SCHEDULER_TOPIC_NAME)
+
+QUEUE_NAME="analytics-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+ANALYTICS_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $PAYMENTS_TOPIC_ARN to queue $ANALYTICS_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $PAYMENTS_TOPIC_ARN $ANALYTICS_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="auth-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+AUTH_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $PAYMENTS_TOPIC_ARN to queue $AUTH_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $PAYMENTS_TOPIC_ARN $AUTH_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+echo "linking topic $AUTH_TOPIC_ARN to queue $AUTH_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $AUTH_TOPIC_ARN $AUTH_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+echo "linking topic $FILES_TOPIC_ARN to queue $AUTH_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $FILES_TOPIC_ARN $AUTH_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="files-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+FILES_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $AUTH_TOPIC_ARN to queue $FILES_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $AUTH_TOPIC_ARN $FILES_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="syncing-server-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+SYNCING_SERVER_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $SYNCING_SERVER_TOPIC_ARN to queue $SYNCING_SERVER_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $SYNCING_SERVER_TOPIC_ARN $SYNCING_SERVER_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+echo "linking topic $SYNCING_SERVER_TOPIC_ARN to queue $SYNCING_SERVER_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $SYNCING_SERVER_TOPIC_ARN $SYNCING_SERVER_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+echo "linking topic $AUTH_TOPIC_ARN to queue $SYNCING_SERVER_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $AUTH_TOPIC_ARN $SYNCING_SERVER_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="revisions-server-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+REVISIONS_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "linking topic $SYNCING_SERVER_TOPIC_ARN to queue $REVISIONS_QUEUE_ARN"
+LINKING_RESULT=$(link_queue_and_topic $SYNCING_SERVER_TOPIC_ARN $REVISIONS_QUEUE_ARN)
+echo "linking done:"
+echo "$LINKING_RESULT"
+
+QUEUE_NAME="scheduler-local-queue"
+
+echo "creating queue $QUEUE_NAME"
+QUEUE_URL=$(create_queue ${QUEUE_NAME})
+echo "created queue: $QUEUE_URL"
+SCHEDULER_QUEUE_ARN=$(get_queue_arn_from_name $QUEUE_NAME)
+
+echo "all topics are:"
+echo "$(get_all_topics)"
+
+echo "all queues are:"
+echo "$(get_all_queues)"

docker/supervisord.conf

@@ -0,0 +1,75 @@
+[supervisord]
+nodaemon=true
+logfile=/var/lib/server/logs/supervisord.log
+
+[program:syncing-server]
+directory=/opt/bundled/syncing-server/packages/syncing-server
+command=/opt/bundled/syncing-server/packages/syncing-server/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/syncing-server.log
+stderr_logfile=/var/lib/server/logs/syncing-server.err
+
+[program:syncing-server-worker]
+directory=/opt/bundled/syncing-server/packages/syncing-server
+command=/opt/bundled/syncing-server/packages/syncing-server/supervisor/supervisor-worker.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/syncing-server-worker.log
+stderr_logfile=/var/lib/server/logs/syncing-server-worker.err
+
+[program:auth]
+directory=/opt/bundled/auth/packages/auth
+command=/opt/bundled/auth/packages/auth/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/auth.log
+stderr_logfile=/var/lib/server/logs/auth.err
+
+[program:auth-worker]
+directory=/opt/bundled/auth/packages/auth
+command=/opt/bundled/auth/packages/auth/supervisor/supervisor-worker.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/auth-worker.log
+stderr_logfile=/var/lib/server/logs/auth-worker.err
+
+[program:files]
+directory=/opt/bundled/files/packages/files
+command=/opt/bundled/files/packages/files/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/files.log
+stderr_logfile=/var/lib/server/logs/files.err
+
+[program:files-worker]
+directory=/opt/bundled/files/packages/files
+command=/opt/bundled/files/packages/files/supervisor/supervisor-worker.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/files-worker.log
+stderr_logfile=/var/lib/server/logs/files-worker.err
+
+[program:revisions]
+directory=/opt/bundled/revisions/packages/revisions
+command=/opt/bundled/revisions/packages/revisions/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/revisions.log
+stderr_logfile=/var/lib/server/logs/revisions.err
+
+[program:revisions-worker]
+directory=/opt/bundled/revisions/packages/revisions
+command=/opt/bundled/revisions/packages/revisions/supervisor/supervisor-worker.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/revisions-worker.log
+stderr_logfile=/var/lib/server/logs/revisions-worker.err
+
+[program:api-gateway]
+directory=/opt/bundled/api-gateway/packages/api-gateway
+command=/opt/bundled/api-gateway/packages/api-gateway/supervisor/supervisor-server.sh
+autostart=true
+autorestart=true
+stdout_logfile=/var/lib/server/logs/api-gateway.log
+stderr_logfile=/var/lib/server/logs/api-gateway.err

docker/wait-for.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+WAIT_FOR_HOST="$1"
+shift
+WAIT_FOR_PORT="$1"
+shift
+
+while ! nc -vz $WAIT_FOR_HOST $WAIT_FOR_PORT; do
+  echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is unavailable yet - waiting for it to start"
+  sleep 10
+done
+
+echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is up. Proceeding to startup."

package.json

@@ -12,30 +12,8 @@
   },
   "scripts": {
     "lint": "yarn workspaces foreach -p -j 10 --verbose run lint",
-    "lint:auth": "yarn workspace @standardnotes/auth-server lint",
-    "lint:scheduler": "yarn workspace @standardnotes/scheduler-server lint",
-    "lint:syncing-server-js": "yarn workspace @standardnotes/syncing-server lint",
-    "lint:files": "yarn workspace @standardnotes/files-server lint",
-    "lint:api-gateway": "yarn workspace @standardnotes/api-gateway lint",
-    "lint:event-store": "yarn workspace @standardnotes/event-store lint",
-    "lint:websockets": "yarn workspace @standardnotes/websockets-server lint",
-    "lint:workspace": "yarn workspace @standardnotes/workspace-server lint",
-    "lint:analytics": "yarn workspace @standardnotes/analytics lint",
-    "lint:revisions": "yarn workspace @standardnotes/revisions-server lint",
     "clean": "yarn workspaces foreach -p --verbose run clean",
     "setup:env": "cp .env.sample .env && yarn workspaces foreach -p --verbose run setup:env",
-    "start:auth": "yarn workspace @standardnotes/auth-server start",
-    "start:auth-worker": "yarn workspace @standardnotes/auth-server worker",
-    "start:scheduler": "yarn workspace @standardnotes/scheduler-server worker",
-    "start:syncing-server": "yarn workspace @standardnotes/syncing-server start",
-    "start:syncing-server-worker": "yarn workspace @standardnotes/syncing-server worker",
-    "start:files": "yarn workspace @standardnotes/files-server start",
-    "start:files-worker": "yarn workspace @standardnotes/files-server worker",
-    "start:api-gateway": "yarn workspace @standardnotes/api-gateway start",
-    "start:websockets": "yarn workspace @standardnotes/websockets-server start",
-    "start:workspace": "yarn workspace @standardnotes/workspace-server start",
-    "start:analytics": "yarn workspace @standardnotes/analytics worker",
-    "start:revisions": "yarn workspace @standardnotes/revisions-server start",
     "release": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish new version\"",
     "publish": "lerna publish from-git --yes --no-verify-access --loglevel verbose",
     "postversion": "./scripts/push-tags-one-by-one.sh",

packages/analytics/.env.sample

@@ -13,7 +13,6 @@ DB_MIGRATIONS_PATH=dist/migrations/*.js
 ADMIN_EMAILS=test@standardnotes.com
 
 REDIS_URL=redis://cache
-REDIS_EVENTS_CHANNEL=events
 
 SNS_TOPIC_ARN=
 SNS_AWS_REGION=

packages/analytics/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.21.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.21.0...@standardnotes/analytics@2.21.1) (2023-02-23)
+
+### Bug Fixes
+
+* **analytics:** add general activity metric to mixpanel ([9d87200](https://github.com/standardnotes/server/commit/9d872008a7df7ccdd9afe7e7d99ccb0f12680319))
+
+# [2.21.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.20.3...@standardnotes/analytics@2.21.0) (2023-02-23)
+
+### Features
+
+* **analytics:** add listening on session created and refreshed events ([6911802](https://github.com/standardnotes/server/commit/6911802b8743d5d21fe1dcc3006e1d8d699fa94d))
+
+## [2.20.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.20.2...@standardnotes/analytics@2.20.3) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.20.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.20.1...@standardnotes/analytics@2.20.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+## [2.20.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.20.0...@standardnotes/analytics@2.20.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
+# [2.20.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.16...@standardnotes/analytics@2.20.0) (2023-02-15)
+
+### Features
+
+* optimize memory on server utilities ([881a696](https://github.com/standardnotes/server/commit/881a6967aca57d68795af0792114f848ddddf120))
+
+## [2.19.16](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.15...@standardnotes/analytics@2.19.16) (2023-02-06)
+
+**Note:** Version bump only for package @standardnotes/analytics
+
 ## [2.19.15](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.19.14...@standardnotes/analytics@2.19.15) (2023-01-30)
 
 ### Bug Fixes

packages/analytics/Dockerfile

@@ -8,10 +8,10 @@ ENV NODE_ENV production
 
 RUN corepack enable
 
-WORKDIR /workspace
-
 COPY ./ /workspace
 
+WORKDIR /workspace/packages/analytics
+
 ENTRYPOINT [ "/workspace/packages/analytics/docker/entrypoint.sh" ]
 
 CMD [ "start-worker" ]

packages/analytics/docker/entrypoint-report.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/report.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/analytics/docker/entrypoint-worker.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/worker.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/analytics/docker/entrypoint.sh

@@ -6,12 +6,12 @@ COMMAND=$1 && shift 1
 case "$COMMAND" in
   'start-worker' )
     echo "[Docker] Starting Worker..."
-    yarn workspace @standardnotes/analytics worker
+    node docker/entrypoint-worker.js
     ;;
 
   'report' )
     echo "[Docker] Starting Usage Report Generation..."
-    yarn workspace @standardnotes/analytics report
+    node docker/entrypoint-report.js
     ;;
 
    * )

packages/analytics/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.19.15",
+  "version": "2.21.1",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/analytics/src/Bootstrap/Container.ts

@@ -15,9 +15,6 @@ import TYPES from './Types'
 import { AppDataSource } from './DataSource'
 import { DomainEventFactory } from '../Domain/Event/DomainEventFactory'
 import {
-  RedisDomainEventPublisher,
-  RedisDomainEventSubscriberFactory,
-  RedisEventMessageHandler,
   SNSDomainEventPublisher,
   SQSDomainEventSubscriberFactory,
   SQSEventMessageHandler,
@@ -58,6 +55,8 @@ import { StatisticMeasureRepositoryInterface } from '../Domain/Statistics/Statis
 import { StatisticPersistenceRequestedEventHandler } from '../Domain/Handler/StatisticPersistenceRequestedEventHandler'
 import { SNSClient, SNSClientConfig } from '@aws-sdk/client-sns'
 import { SQSClient, SQSClientConfig } from '@aws-sdk/client-sqs'
+import { SessionCreatedEventHandler } from '../Domain/Handler/SessionCreatedEventHandler'
+import { SessionRefreshedEventHandler } from '../Domain/Handler/SessionRefreshedEventHandler'
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const newrelicFormatter = require('@newrelic/winston-enricher')
@@ -95,22 +94,20 @@ export class ContainerConfigLoader {
     })
     container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
 
-    if (env.get('SNS_TOPIC_ARN', true)) {
-      const snsConfig: SNSClientConfig = {
-        apiVersion: 'latest',
-        region: env.get('SNS_AWS_REGION', true),
-      }
-      if (env.get('SNS_ENDPOINT', true)) {
-        snsConfig.endpoint = env.get('SNS_ENDPOINT', true)
-      }
-      if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
-        snsConfig.credentials = {
-          accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
-          secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
-        }
-      }
-      container.bind<SNSClient>(TYPES.SNS).toConstantValue(new SNSClient(snsConfig))
+    const snsConfig: SNSClientConfig = {
+      apiVersion: 'latest',
+      region: env.get('SNS_AWS_REGION', true),
     }
+    if (env.get('SNS_ENDPOINT', true)) {
+      snsConfig.endpoint = env.get('SNS_ENDPOINT', true)
+    }
+    if (env.get('SNS_ACCESS_KEY_ID', true) && env.get('SNS_SECRET_ACCESS_KEY', true)) {
+      snsConfig.credentials = {
+        accessKeyId: env.get('SNS_ACCESS_KEY_ID', true),
+        secretAccessKey: env.get('SNS_SECRET_ACCESS_KEY', true),
+      }
+    }
+    container.bind<SNSClient>(TYPES.SNS).toConstantValue(new SNSClient(snsConfig))
 
     if (env.get('SQS_QUEUE_URL', true)) {
       const sqsConfig: SQSClientConfig = {
@@ -130,10 +127,9 @@ export class ContainerConfigLoader {
 
     // env vars
     container.bind(TYPES.REDIS_URL).toConstantValue(env.get('REDIS_URL'))
-    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN', true))
+    container.bind(TYPES.SNS_TOPIC_ARN).toConstantValue(env.get('SNS_TOPIC_ARN'))
     container.bind(TYPES.SNS_AWS_REGION).toConstantValue(env.get('SNS_AWS_REGION', true))
-    container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL', true))
-    container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
+    container.bind(TYPES.SQS_QUEUE_URL).toConstantValue(env.get('SQS_QUEUE_URL'))
     container.bind(TYPES.NEW_RELIC_ENABLED).toConstantValue(env.get('NEW_RELIC_ENABLED', true))
     container.bind(TYPES.ADMIN_EMAILS).toConstantValue(env.get('ADMIN_EMAILS').split(','))
     container.bind(TYPES.MIXPANEL_TOKEN).toConstantValue(env.get('MIXPANEL_TOKEN', true))
@@ -149,17 +145,9 @@ export class ContainerConfigLoader {
       .toConstantValue(new RedisStatisticsStore(container.get(TYPES.PeriodKeyGenerator), container.get(TYPES.Redis)))
     container.bind<TimerInterface>(TYPES.Timer).toConstantValue(new Timer())
 
-    if (env.get('SNS_TOPIC_ARN', true)) {
-      container
-        .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
-        .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
-    } else {
-      container
-        .bind<RedisDomainEventPublisher>(TYPES.DomainEventPublisher)
-        .toConstantValue(
-          new RedisDomainEventPublisher(container.get(TYPES.Redis), container.get(TYPES.REDIS_EVENTS_CHANNEL)),
-        )
-    }
+    container
+      .bind<SNSDomainEventPublisher>(TYPES.DomainEventPublisher)
+      .toConstantValue(new SNSDomainEventPublisher(container.get(TYPES.SNS), container.get(TYPES.SNS_TOPIC_ARN)))
     if (env.get('MIXPANEL_TOKEN', true)) {
       container.bind<Mixpanel>(TYPES.MixpanelClient).toConstantValue(Mixpanel.init(env.get('MIXPANEL_TOKEN', true)))
     }
@@ -200,6 +188,8 @@ export class ContainerConfigLoader {
       .to(AccountDeletionRequestedEventHandler)
     container.bind<PaymentFailedEventHandler>(TYPES.PaymentFailedEventHandler).to(PaymentFailedEventHandler)
     container.bind<PaymentSuccessEventHandler>(TYPES.PaymentSuccessEventHandler).to(PaymentSuccessEventHandler)
+    container.bind<SessionCreatedEventHandler>(TYPES.SessionCreatedEventHandler).to(SessionCreatedEventHandler)
+    container.bind<SessionRefreshedEventHandler>(TYPES.SessionRefreshedEventHandler).to(SessionRefreshedEventHandler)
     container
       .bind<SubscriptionCancelledEventHandler>(TYPES.SubscriptionCancelledEventHandler)
       .to(SubscriptionCancelledEventHandler)
@@ -248,39 +238,26 @@ export class ContainerConfigLoader {
       ['SUBSCRIPTION_REACTIVATED', container.get(TYPES.SubscriptionReactivatedEventHandler)],
       ['REFUND_PROCESSED', container.get(TYPES.RefundProcessedEventHandler)],
       ['STATISTIC_PERSISTENCE_REQUESTED', container.get(TYPES.StatisticPersistenceRequestedEventHandler)],
+      ['SESSION_CREATED', container.get(TYPES.SessionCreatedEventHandler)],
+      ['SESSION_REFRESHED', container.get(TYPES.SessionRefreshedEventHandler)],
     ])
 
-    if (env.get('SQS_QUEUE_URL', true)) {
-      container
-        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
-        .toConstantValue(
-          env.get('NEW_RELIC_ENABLED', true) === 'true'
-            ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
-            : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
-        )
-      container
-        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
-        .toConstantValue(
-          new SQSDomainEventSubscriberFactory(
-            container.get(TYPES.SQS),
-            container.get(TYPES.SQS_QUEUE_URL),
-            container.get(TYPES.DomainEventMessageHandler),
-          ),
-        )
-    } else {
-      container
-        .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
-        .toConstantValue(new RedisEventMessageHandler(eventHandlers, container.get(TYPES.Logger)))
-      container
-        .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
-        .toConstantValue(
-          new RedisDomainEventSubscriberFactory(
-            container.get(TYPES.Redis),
-            container.get(TYPES.DomainEventMessageHandler),
-            container.get(TYPES.REDIS_EVENTS_CHANNEL),
-          ),
-        )
-    }
+    container
+      .bind<DomainEventMessageHandlerInterface>(TYPES.DomainEventMessageHandler)
+      .toConstantValue(
+        env.get('NEW_RELIC_ENABLED', true) === 'true'
+          ? new SQSNewRelicEventMessageHandler(eventHandlers, container.get(TYPES.Logger))
+          : new SQSEventMessageHandler(eventHandlers, container.get(TYPES.Logger)),
+      )
+    container
+      .bind<DomainEventSubscriberFactoryInterface>(TYPES.DomainEventSubscriberFactory)
+      .toConstantValue(
+        new SQSDomainEventSubscriberFactory(
+          container.get(TYPES.SQS),
+          container.get(TYPES.SQS_QUEUE_URL),
+          container.get(TYPES.DomainEventMessageHandler),
+        ),
+      )
 
     return container
   }

packages/analytics/src/Bootstrap/Types.ts

@@ -9,7 +9,6 @@ const TYPES = {
   SNS_AWS_REGION: Symbol.for('SNS_AWS_REGION'),
   SQS_QUEUE_URL: Symbol.for('SQS_QUEUE_URL'),
   SQS_AWS_REGION: Symbol.for('SQS_AWS_REGION'),
-  REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
   NEW_RELIC_ENABLED: Symbol.for('NEW_RELIC_ENABLED'),
   ADMIN_EMAILS: Symbol.for('ADMIN_EMAILS'),
   MIXPANEL_TOKEN: Symbol.for('MIXPANEL_TOKEN'),
@@ -38,6 +37,8 @@ const TYPES = {
   SubscriptionReactivatedEventHandler: Symbol.for('SubscriptionReactivatedEventHandler'),
   RefundProcessedEventHandler: Symbol.for('RefundProcessedEventHandler'),
   StatisticPersistenceRequestedEventHandler: Symbol.for('StatisticPersistenceRequestedEventHandler'),
+  SessionCreatedEventHandler: Symbol.for('SessionCreatedEventHandler'),
+  SessionRefreshedEventHandler: Symbol.for('SessionRefreshedEventHandler'),
   // Maps
   RevenueModificationMap: Symbol.for('RevenueModificationMap'),
   // Services

packages/analytics/src/Domain/Handler/SessionCreatedEventHandler.ts

@@ -0,0 +1,28 @@
+import { SessionCreatedEvent, DomainEventHandlerInterface } from '@standardnotes/domain-events'
+import { inject, injectable, optional } from 'inversify'
+import { Mixpanel } from 'mixpanel'
+
+import TYPES from '../../Bootstrap/Types'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+
+@injectable()
+export class SessionCreatedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @inject(TYPES.MixpanelClient) @optional() private mixpanelClient: Mixpanel | null,
+  ) {}
+
+  async handle(event: SessionCreatedEvent): Promise<void> {
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userUuid: event.payload.userUuid })
+
+    if (this.mixpanelClient !== null) {
+      this.mixpanelClient.track(event.type, {
+        distinct_id: analyticsId.toString(),
+      })
+
+      this.mixpanelClient.track('GENERAL_ACTIVITY', {
+        distinct_id: analyticsId.toString(),
+      })
+    }
+  }
+}

packages/analytics/src/Domain/Handler/SessionRefreshedEventHandler.ts

@@ -0,0 +1,28 @@
+import { SessionRefreshedEvent, DomainEventHandlerInterface } from '@standardnotes/domain-events'
+import { inject, injectable, optional } from 'inversify'
+import { Mixpanel } from 'mixpanel'
+
+import TYPES from '../../Bootstrap/Types'
+import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
+
+@injectable()
+export class SessionRefreshedEventHandler implements DomainEventHandlerInterface {
+  constructor(
+    @inject(TYPES.GetUserAnalyticsId) private getUserAnalyticsId: GetUserAnalyticsId,
+    @inject(TYPES.MixpanelClient) @optional() private mixpanelClient: Mixpanel | null,
+  ) {}
+
+  async handle(event: SessionRefreshedEvent): Promise<void> {
+    const { analyticsId } = await this.getUserAnalyticsId.execute({ userUuid: event.payload.userUuid })
+
+    if (this.mixpanelClient !== null) {
+      this.mixpanelClient.track(event.type, {
+        distinct_id: analyticsId.toString(),
+      })
+
+      this.mixpanelClient.track('GENERAL_ACTIVITY', {
+        distinct_id: analyticsId.toString(),
+      })
+    }
+  }
+}

packages/api-gateway/.env.sample

@@ -6,7 +6,6 @@ PORT=3000
 
 SYNCING_SERVER_JS_URL=http://syncing_server_js:3000
 AUTH_SERVER_URL=http://auth:3000
-WORKSPACE_SERVER_URL=http://workspace:3000
 WEB_SOCKET_SERVER_URL=http://websockets:3000
 PAYMENTS_SERVER_URL=http://payments:3000
 FILES_SERVER_URL=http://files:3000
@@ -27,7 +26,6 @@ NEW_RELIC_LOG_ENABLED=false
 NEW_RELIC_LOG_LEVEL=info
 
 REDIS_URL=redis://cache
-REDIS_EVENTS_CHANNEL=events
 
 # (Optional) Caching Cross Service Tokens
 CROSS_SERVICE_TOKEN_CACHE_TTL=

packages/api-gateway/CHANGELOG.md

@@ -3,6 +3,78 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.49.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.49.3...@standardnotes/api-gateway@1.49.4) (2023-02-25)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.49.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.49.2...@standardnotes/api-gateway@1.49.3) (2023-02-24)
+
+### Bug Fixes
+
+* **api-gateywa:** remove stale proxy references ([dfa5187](https://github.com/standardnotes/api-gateway/commit/dfa5187ff73833bf981d273da79f78ae0309a493))
+
+## [1.49.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.49.1...@standardnotes/api-gateway@1.49.2) (2023-02-23)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.49.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.49.0...@standardnotes/api-gateway@1.49.1) (2023-02-23)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.49.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.48.3...@standardnotes/api-gateway@1.49.0) (2023-02-22)
+
+### Bug Fixes
+
+* **api-gateway:** proxy endpoint for request passing ([bc9182f](https://github.com/standardnotes/api-gateway/commit/bc9182f214c5386c5f1dd0bcbafbce34d413b6e8))
+
+### Features
+
+* **proxy:** add proxy server ([dfe30d7](https://github.com/standardnotes/api-gateway/commit/dfe30d7f5e8598ec1886db0e061b7d593cc27e29))
+
+## [1.48.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.48.2...@standardnotes/api-gateway@1.48.3) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.48.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.48.1...@standardnotes/api-gateway@1.48.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+## [1.48.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.48.0...@standardnotes/api-gateway@1.48.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.48.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.47.1...@standardnotes/api-gateway@1.48.0) (2023-02-15)
+
+### Features
+
+* optimize memory usage ([#444](https://github.com/standardnotes/api-gateway/issues/444)) ([fdf4b29](https://github.com/standardnotes/api-gateway/commit/fdf4b29ae2717e9b5d1fba2722beb7621a7e5c37))
+
+## [1.47.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.47.0...@standardnotes/api-gateway@1.47.1) (2023-02-14)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
+# [1.47.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.13...@standardnotes/api-gateway@1.47.0) (2023-02-13)
+
+### Features
+
+* **syncing-server:** refactor container config into server and worker ([#443](https://github.com/standardnotes/api-gateway/issues/443)) ([993d311](https://github.com/standardnotes/api-gateway/commit/993d31167b8b0ac11e3df530d2d1ee566940df6e))
+
+## [1.46.13](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.12...@standardnotes/api-gateway@1.46.13) (2023-02-09)
+
+### Bug Fixes
+
+* performance of startup sequence in supervisor controlled self-hosting setup ([5bbdc7e](https://github.com/standardnotes/api-gateway/commit/5bbdc7e426c436b17dc130e3c6d9163080561c76))
+
+## [1.46.12](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.11...@standardnotes/api-gateway@1.46.12) (2023-02-09)
+
+### Bug Fixes
+
+* optimize memory usage ([e96fd6d](https://github.com/standardnotes/api-gateway/commit/e96fd6d69e1252842b5c91b1bedefa36e5d4a232))
+
+## [1.46.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.10...@standardnotes/api-gateway@1.46.11) (2023-02-06)
+
+**Note:** Version bump only for package @standardnotes/api-gateway
+
 ## [1.46.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.46.9...@standardnotes/api-gateway@1.46.10) (2023-01-30)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/Dockerfile

@@ -8,10 +8,10 @@ ENV NODE_ENV production
 
 RUN corepack enable
 
-WORKDIR /workspace
-
 COPY ./ /workspace
 
+WORKDIR /workspace/packages/api-gateway
+
 ENTRYPOINT [ "/workspace/packages/api-gateway/docker/entrypoint.sh" ]
 
 CMD [ "start-web" ]

packages/api-gateway/bin/server.ts

@@ -19,8 +19,6 @@ import '../src/Controller/v1/TokensController'
 import '../src/Controller/v1/OfflineController'
 import '../src/Controller/v1/FilesController'
 import '../src/Controller/v1/SubscriptionInvitesController'
-import '../src/Controller/v1/WorkspacesController'
-import '../src/Controller/v1/InvitesController'
 import '../src/Controller/v1/AuthenticatorsController'
 
 import '../src/Controller/v2/PaymentsControllerV2'

packages/api-gateway/docker/entrypoint-server.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/api-gateway/docker/entrypoint.sh

@@ -4,16 +4,9 @@ set -e
 COMMAND=$1 && shift 1
 
 case "$COMMAND" in
-  'start-local' )
-    echo "Building the project..."
-    yarn workspace @standardnotes/api-gateway build
-    echo "Starting Web..."
-    yarn workspace @standardnotes/api-gateway start
-    ;;
-
   'start-web' )
     echo "Starting Web..."
-    yarn workspace @standardnotes/api-gateway start
+    node docker/entrypoint-server.js
     ;;
 
    * )

packages/api-gateway/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.46.10",
+  "version": "1.49.4",
   "engines": {
     "node": ">=18.0.0 <19.0.0"
   },

packages/api-gateway/src/Bootstrap/Container.ts

@@ -59,13 +59,11 @@ export class ContainerConfigLoader {
     container.bind(TYPES.PAYMENTS_SERVER_URL).toConstantValue(env.get('PAYMENTS_SERVER_URL', true))
     container.bind(TYPES.FILES_SERVER_URL).toConstantValue(env.get('FILES_SERVER_URL', true))
     container.bind(TYPES.AUTH_JWT_SECRET).toConstantValue(env.get('AUTH_JWT_SECRET'))
-    container.bind(TYPES.WORKSPACE_SERVER_URL).toConstantValue(env.get('WORKSPACE_SERVER_URL', true))
     container.bind(TYPES.WEB_SOCKET_SERVER_URL).toConstantValue(env.get('WEB_SOCKET_SERVER_URL', true))
     container
       .bind(TYPES.HTTP_CALL_TIMEOUT)
       .toConstantValue(env.get('HTTP_CALL_TIMEOUT', true) ? +env.get('HTTP_CALL_TIMEOUT', true) : 60_000)
     container.bind(TYPES.VERSION).toConstantValue(env.get('VERSION'))
-    container.bind(TYPES.REDIS_EVENTS_CHANNEL).toConstantValue(env.get('REDIS_EVENTS_CHANNEL'))
     container.bind(TYPES.CROSS_SERVICE_TOKEN_CACHE_TTL).toConstantValue(+env.get('CROSS_SERVICE_TOKEN_CACHE_TTL', true))
 
     // Middleware

packages/api-gateway/src/Bootstrap/Types.ts

@@ -9,12 +9,10 @@ const TYPES = {
   FILES_SERVER_URL: Symbol.for('FILES_SERVER_URL'),
   REVISIONS_SERVER_URL: Symbol.for('REVISIONS_SERVER_URL'),
   EMAIL_SERVER_URL: Symbol.for('EMAIL_SERVER_URL'),
-  WORKSPACE_SERVER_URL: Symbol.for('WORKSPACE_SERVER_URL'),
   WEB_SOCKET_SERVER_URL: Symbol.for('WEB_SOCKET_SERVER_URL'),
   AUTH_JWT_SECRET: Symbol.for('AUTH_JWT_SECRET'),
   HTTP_CALL_TIMEOUT: Symbol.for('HTTP_CALL_TIMEOUT'),
   VERSION: Symbol.for('VERSION'),
-  REDIS_EVENTS_CHANNEL: Symbol.for('REDIS_EVENTS_CHANNEL'),
   CROSS_SERVICE_TOKEN_CACHE_TTL: Symbol.for('CROSS_SERVICE_TOKEN_CACHE_TTL'),
   // Middleware
   AuthMiddleware: Symbol.for('AuthMiddleware'),

packages/api-gateway/src/Controller/v1/InvitesController.ts

@@ -1,23 +0,0 @@
-import { inject } from 'inversify'
-import { Request, Response } from 'express'
-import { controller, BaseHttpController, httpPost } from 'inversify-express-utils'
-
-import TYPES from '../../Bootstrap/Types'
-import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface'
-
-@controller('/v1/invites', TYPES.AuthMiddleware)
-export class InvitesController extends BaseHttpController {
-  constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) {
-    super()
-  }
-
-  @httpPost('/:inviteUuid/accept')
-  async accept(request: Request, response: Response): Promise<void> {
-    await this.httpService.callWorkspaceServer(
-      request,
-      response,
-      `invites/${request.params.inviteUuid}/accept`,
-      request.body,
-    )
-  }
-}

packages/api-gateway/src/Controller/v1/PaymentsController.ts

@@ -145,11 +145,6 @@ export class PaymentsController extends BaseHttpController {
     await this.httpService.callPaymentsServer(request, response, 'api/pro_users/stripe-setup-intent', request.body)
   }
 
-  @httpGet('/pro_users/cp-prepayment-info', TYPES.SubscriptionTokenAuthMiddleware)
-  async coinpaymentsPrepaymentInfo(request: Request, response: Response): Promise<void> {
-    await this.httpService.callPaymentsServer(request, response, 'api/pro_users/cp-prepayment-info', request.body)
-  }
-
   @all('/pro_users(/*)?')
   async proUsers(request: Request, response: Response): Promise<void> {
     await this.httpService.callPaymentsServer(request, response, request.path.replace('v1', 'api'), request.body)

packages/api-gateway/src/Controller/v1/RevisionsController.ts

@@ -1,35 +1,41 @@
-import { Request, Response } from 'express'
-import { inject } from 'inversify'
-import { BaseHttpController, controller, httpDelete, httpGet } from 'inversify-express-utils'
+import { BaseHttpController, controller, httpDelete, httpGet, results } from 'inversify-express-utils'
 import TYPES from '../../Bootstrap/Types'
-import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface'
 
 @controller('/v1/items/:item_id/revisions', TYPES.AuthMiddleware)
 export class RevisionsController extends BaseHttpController {
-  constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) {
-    super()
-  }
-
   @httpGet('/')
-  async getRevisions(request: Request, response: Response): Promise<void> {
-    await this.httpService.callSyncingServer(request, response, `items/${request.params.item_id}/revisions`)
+  async getRevisions(): Promise<results.JsonResult> {
+    return this.json(
+      {
+        error: {
+          message: 'Please update your client application.',
+        },
+      },
+      410,
+    )
   }
 
   @httpGet('/:id')
-  async getRevision(request: Request, response: Response): Promise<void> {
-    await this.httpService.callSyncingServer(
-      request,
-      response,
-      `items/${request.params.item_id}/revisions/${request.params.id}`,
+  async getRevision(): Promise<results.JsonResult> {
+    return this.json(
+      {
+        error: {
+          message: 'Please update your client application.',
+        },
+      },
+      410,
     )
   }
 
   @httpDelete('/:id')
-  async deleteRevision(request: Request, response: Response): Promise<void> {
-    await this.httpService.callSyncingServer(
-      request,
-      response,
-      `items/${request.params.item_id}/revisions/${request.params.id}`,
+  async deleteRevision(): Promise<results.JsonResult> {
+    return this.json(
+      {
+        error: {
+          message: 'Please update your client application.',
+        },
+      },
+      410,
     )
   }
 }

packages/api-gateway/src/Controller/v1/WorkspacesController.ts

@@ -1,53 +0,0 @@
-import { inject } from 'inversify'
-import { Request, Response } from 'express'
-import { controller, BaseHttpController, httpPost, httpGet } from 'inversify-express-utils'
-
-import TYPES from '../../Bootstrap/Types'
-import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface'
-
-@controller('/v1/workspaces', TYPES.AuthMiddleware)
-export class WorkspacesController extends BaseHttpController {
-  constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) {
-    super()
-  }
-
-  @httpPost('/')
-  async create(request: Request, response: Response): Promise<void> {
-    await this.httpService.callWorkspaceServer(request, response, 'workspaces', request.body)
-  }
-
-  @httpGet('/:workspaceUuid/users')
-  async listWorkspaceUsers(request: Request, response: Response): Promise<void> {
-    await this.httpService.callWorkspaceServer(
-      request,
-      response,
-      `workspaces/${request.params.workspaceUuid}/users`,
-      request.body,
-    )
-  }
-
-  @httpPost('/:workspaceUuid/users/:userUuid/keyshare')
-  async initiateKeyshare(request: Request, response: Response): Promise<void> {
-    await this.httpService.callWorkspaceServer(
-      request,
-      response,
-      `workspaces/${request.params.workspaceUuid}/users/${request.params.userUuid}/keyshare`,
-      request.body,
-    )
-  }
-
-  @httpGet('/')
-  async listWorkspaces(request: Request, response: Response): Promise<void> {
-    await this.httpService.callWorkspaceServer(request, response, 'workspaces', request.body)
-  }
-
-  @httpPost('/:workspaceUuid/invites')
-  async invite(request: Request, response: Response): Promise<void> {
-    await this.httpService.callWorkspaceServer(
-      request,
-      response,
-      `workspaces/${request.params.workspaceUuid}/invites`,
-      request.body,
-    )
-  }
-}

packages/api-gateway/src/Service/Http/HttpService.ts

@@ -16,7 +16,6 @@ export class HttpService implements HttpServiceInterface {
     @inject(TYPES.SYNCING_SERVER_JS_URL) private syncingServerJsUrl: string,
     @inject(TYPES.PAYMENTS_SERVER_URL) private paymentsServerUrl: string,
     @inject(TYPES.FILES_SERVER_URL) private filesServerUrl: string,
-    @inject(TYPES.WORKSPACE_SERVER_URL) private workspaceServerUrl: string,
     @inject(TYPES.WEB_SOCKET_SERVER_URL) private webSocketServerUrl: string,
     @inject(TYPES.REVISIONS_SERVER_URL) private revisionsServerUrl: string,
     @inject(TYPES.EMAIL_SERVER_URL) private emailServerUrl: string,
@@ -81,21 +80,6 @@ export class HttpService implements HttpServiceInterface {
     await this.callServer(this.emailServerUrl, request, response, endpoint, payload)
   }
 
-  async callWorkspaceServer(
-    request: Request,
-    response: Response,
-    endpoint: string,
-    payload?: Record<string, unknown> | string,
-  ): Promise<void> {
-    if (!this.workspaceServerUrl) {
-      response.status(400).send({ message: 'Workspace Server not configured' })
-
-      return
-    }
-
-    await this.callServer(this.workspaceServerUrl, request, response, endpoint, payload)
-  }
-
   async callWebSocketServer(
     request: Request,
     response: Response,

packages/api-gateway/src/Service/Http/HttpServiceInterface.ts

@@ -43,12 +43,6 @@ export interface HttpServiceInterface {
     endpoint: string,
     payload?: Record<string, unknown> | string,
   ): Promise<void>
-  callWorkspaceServer(
-    request: Request,
-    response: Response,
-    endpoint: string,
-    payload?: Record<string, unknown> | string,
-  ): Promise<void>
   callWebSocketServer(
     request: Request,
     response: Response,

packages/api-gateway/supervisor/supervisor-server.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+sh supervisor/wait-for.sh localhost $SYNCING_SERVER_PORT
+node docker/entrypoint-server.js

packages/api-gateway/supervisor/wait-for.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+WAIT_FOR_HOST="$1"
+shift
+WAIT_FOR_PORT="$1"
+shift
+
+while ! nc -vz $WAIT_FOR_HOST $WAIT_FOR_PORT; do
+  echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is unavailable yet - waiting for it to start"
+  sleep 10
+done
+
+echo "$WAIT_FOR_HOST:$WAIT_FOR_PORT is up. Proceeding to startup."

packages/auth/.env.sample

@@ -43,8 +43,6 @@ SQS_AWS_REGION=
 
 SYNCING_SERVER_URL=http://syncing-server-js:3000
 
-REDIS_EVENTS_CHANNEL=events
-
 # (Optional) New Relic Setup
 NEW_RELIC_ENABLED=false
 NEW_RELIC_APP_NAME=Auth

packages/auth/CHANGELOG.md

@@ -3,6 +3,99 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.89.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.89.3...@standardnotes/auth-server@1.89.4) (2023-03-01)
+
+### Bug Fixes
+
+* **auth:** updating counter post authenticator verification ([a9cc00a](https://github.com/standardnotes/server/commit/a9cc00a4783c12e71eb181a3ccf3218b418750d9))
+
+## [1.89.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.89.2...@standardnotes/auth-server@1.89.3) (2023-02-27)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.89.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.89.1...@standardnotes/auth-server@1.89.2) (2023-02-24)
+
+### Bug Fixes
+
+* **auth:** add cross-platform authenticator selection option ([edc4a20](https://github.com/standardnotes/server/commit/edc4a2085952efe0b83c8e837a52555087714ef7))
+
+## [1.89.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.89.0...@standardnotes/auth-server@1.89.1) (2023-02-23)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.89.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.88.3...@standardnotes/auth-server@1.89.0) (2023-02-23)
+
+### Bug Fixes
+
+* **auth:** add safety buffer for session access token age ttl ([17bd50c](https://github.com/standardnotes/server/commit/17bd50c263520c4936bf674070e46f0ea0b5cfb1))
+* **auth:** mark sessions that are longer than configured as expired ([f13944b](https://github.com/standardnotes/server/commit/f13944badc0e04f153626d0d6ace6f8f6d57e533))
+
+### Features
+
+* **auth:** add publishing session created and session refreshed events ([5b98924](https://github.com/standardnotes/server/commit/5b9892456158819831f1f2dcf349ac861d699a94))
+
+## [1.88.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.88.2...@standardnotes/auth-server@1.88.3) (2023-02-21)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.88.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.88.1...@standardnotes/auth-server@1.88.2) (2023-02-20)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.88.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.88.0...@standardnotes/auth-server@1.88.1) (2023-02-15)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+# [1.88.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.15...@standardnotes/auth-server@1.88.0) (2023-02-15)
+
+### Features
+
+* optimize memory usage ([#444](https://github.com/standardnotes/server/issues/444)) ([fdf4b29](https://github.com/standardnotes/server/commit/fdf4b29ae2717e9b5d1fba2722beb7621a7e5c37))
+
+## [1.87.15](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.14...@standardnotes/auth-server@1.87.15) (2023-02-14)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.87.14](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.13...@standardnotes/auth-server@1.87.14) (2023-02-09)
+
+### Bug Fixes
+
+* performance of startup sequence in supervisor controlled self-hosting setup ([5bbdc7e](https://github.com/standardnotes/server/commit/5bbdc7e426c436b17dc130e3c6d9163080561c76))
+
+## [1.87.13](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.12...@standardnotes/auth-server@1.87.13) (2023-02-09)
+
+### Bug Fixes
+
+* optimize memory usage ([e96fd6d](https://github.com/standardnotes/server/commit/e96fd6d69e1252842b5c91b1bedefa36e5d4a232))
+
+## [1.87.12](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.11...@standardnotes/auth-server@1.87.12) (2023-02-06)
+
+**Note:** Version bump only for package @standardnotes/auth-server
+
+## [1.87.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.10...@standardnotes/auth-server@1.87.11) (2023-02-02)
+
+### Reverts
+
+* Revert "fix(auth): disallow adding u2f devices if a user does not have 2fa enabled" ([bf55bbc](https://github.com/standardnotes/server/commit/bf55bbccd9ab1704671fa3980ede3bd0cc909833))
+
+## [1.87.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.9...@standardnotes/auth-server@1.87.10) (2023-02-02)
+
+### Bug Fixes
+
+* **auth:** disallow adding u2f devices if a user does not have 2fa enabled ([11bcd31](https://github.com/standardnotes/server/commit/11bcd318abc71d5a1fa80b8beda109076e3b6dad))
+
+## [1.87.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.8...@standardnotes/auth-server@1.87.9) (2023-02-02)
+
+### Bug Fixes
+
+* **auth:** verification rpid options ([989e1ce](https://github.com/standardnotes/server/commit/989e1ce175cf70718304dd2d2463949147bcc084))
+
+## [1.87.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.7...@standardnotes/auth-server@1.87.8) (2023-02-02)
+
+### Bug Fixes
+
+* **auth:** allow defining multiple expected origins upon u2f registration and verification ([b7967b3](https://github.com/standardnotes/server/commit/b7967b34d1118534644a3e464e9e43267455519d))
+
 ## [1.87.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.87.6...@standardnotes/auth-server@1.87.7) (2023-01-30)
 
 ### Bug Fixes

packages/auth/Dockerfile

@@ -8,10 +8,10 @@ ENV NODE_ENV production
 
 RUN corepack enable
 
-WORKDIR /workspace
-
 COPY ./ /workspace
 
+WORKDIR /workspace/packages/auth
+
 ENTRYPOINT [ "/workspace/packages/auth/docker/entrypoint.sh" ]
 
 CMD [ "start-web" ]

packages/auth/bin/content.ts

@@ -1,74 +0,0 @@
-import 'reflect-metadata'
-
-import 'newrelic'
-
-import { Logger } from 'winston'
-import * as dayjs from 'dayjs'
-import * as utc from 'dayjs/plugin/utc'
-
-import { ContainerConfigLoader } from '../src/Bootstrap/Container'
-import TYPES from '../src/Bootstrap/Types'
-import { Env } from '../src/Bootstrap/Env'
-import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
-import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
-import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
-import { Stream } from 'stream'
-
-const requestRecalculation = async (
-  userRepository: UserRepositoryInterface,
-  domainEventFactory: DomainEventFactoryInterface,
-  domainEventPublisher: DomainEventPublisherInterface,
-  logger: Logger,
-): Promise<void> => {
-  const stream = await userRepository.streamAll()
-
-  return new Promise((resolve, reject) => {
-    stream
-      .pipe(
-        new Stream.Transform({
-          objectMode: true,
-          transform: async (rawUserData, _encoding, callback) => {
-            try {
-              await domainEventPublisher.publish(
-                domainEventFactory.createUserContentSizeRecalculationRequestedEvent(rawUserData.user_uuid),
-              )
-            } catch (error) {
-              logger.error(`Could not process user ${rawUserData.user_uuid}: ${(error as Error).message}`)
-            }
-
-            callback()
-          },
-        }),
-      )
-      .on('finish', resolve)
-      .on('error', reject)
-  })
-}
-
-const container = new ContainerConfigLoader()
-void container.load().then((container) => {
-  dayjs.extend(utc)
-
-  const env: Env = new Env()
-  env.load()
-
-  const logger: Logger = container.get(TYPES.Logger)
-
-  logger.info('Starting content size recalculation requests ...')
-
-  const userRepository: UserRepositoryInterface = container.get(TYPES.UserRepository)
-  const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
-  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
-
-  Promise.resolve(requestRecalculation(userRepository, domainEventFactory, domainEventPublisher, logger))
-    .then(() => {
-      logger.info('content size recalculation requesting complete')
-
-      process.exit(0)
-    })
-    .catch((error) => {
-      logger.error(`Could not finish content size recalculation requesting : ${error.message}`)
-
-      process.exit(1)
-    })
-})

packages/auth/docker/entrypoint-backup.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/backup.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint-cleanup.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/cleanup.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint-server.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/server.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index

packages/auth/docker/entrypoint-stats.js

@@ -0,0 +1,11 @@
+'use strict'
+
+const path = require('path')
+
+const pnp = require(path.normalize(path.resolve(__dirname, '../../..', '.pnp.cjs'))).setup()
+
+const index = require(path.normalize(path.resolve(__dirname, '../dist/bin/stats.js')))
+
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.default = index