chore(release): publish new version

- @standardnotes/analytics@2.9.7
 - @standardnotes/api-gateway@1.38.2
 - @standardnotes/auth-server@1.59.8
 - @standardnotes/common@1.44.2
 - @standardnotes/domain-events-infra@1.9.24
 - @standardnotes/domain-events@2.86.1
 - @standardnotes/event-store@1.6.19
 - @standardnotes/files-server@1.8.19
 - @standardnotes/predicates@1.5.5
 - @standardnotes/scheduler-server@1.13.20
 - @standardnotes/security@1.6.2
 - @standardnotes/settings@1.18.1
 - @standardnotes/sncrypto-node@1.12.1
 - @standardnotes/syncing-server@1.13.3
 - @standardnotes/time@1.13.1
 - @standardnotes/websockets-server@1.4.21
 - @standardnotes/workspace-server@1.17.19

.github/workflows/revisions.yml

@@ -1,46 +0,0 @@
-name: Revisions Server
-
-concurrency:
-  group: revisions_server
-  cancel-in-progress: true
-
-on:
-  push:
-    tags:
-      - '*standardnotes/revisions-server*'
-  workflow_dispatch:
-
-jobs:
-  call_server_application_workflow:
-    name: Server Application
-    uses: standardnotes/server/.github/workflows/common-server-application.yml@main
-    with:
-      service_name: revisions
-      workspace_name: "@standardnotes/revisions-server"
-      e2e_tag_parameter_name: revisions_image_tag
-      package_path: packages/revisions
-    secrets: inherit
-
-  newrelic:
-    needs: call_server_application_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_REVISIONS_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_REVISIONS_WORKER_PROD }}
-          revision: "${{ github.sha }}"
-          description: "Automated Deployment via Github Actions"
-          user: "${{ github.actor }}"

.nvmrc

@@ -1 +1 @@
-18.12.1
+16.15.1

.pnp.cjs

@@ -29,10 +29,6 @@ const RAW_RUNTIME_STATE =
       "name": "@standardnotes/common",\
       "reference": "workspace:packages/common"\
     },\
-    {\
-      "name": "@standardnotes/domain-core",\
-      "reference": "workspace:packages/domain-core"\
-    },\
     {\
       "name": "@standardnotes/domain-events",\
       "reference": "workspace:packages/domain-events"\
@@ -53,10 +49,6 @@ const RAW_RUNTIME_STATE =
       "name": "@standardnotes/predicates",\
       "reference": "workspace:packages/predicates"\
     },\
-    {\
-      "name": "@standardnotes/revisions-server",\
-      "reference": "workspace:packages/revisions"\
-    },\
     {\
       "name": "@standardnotes/scheduler-server",\
       "reference": "workspace:packages/scheduler"\
@@ -97,13 +89,11 @@ const RAW_RUNTIME_STATE =
     ["@standardnotes/api-gateway", ["workspace:packages/api-gateway"]],\
     ["@standardnotes/auth-server", ["workspace:packages/auth"]],\
     ["@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/event-store", ["workspace:packages/event-store"]],\
     ["@standardnotes/files-server", ["workspace:packages/files"]],\
     ["@standardnotes/predicates", ["workspace:packages/predicates"]],\
-    ["@standardnotes/revisions-server", ["workspace:packages/revisions"]],\
     ["@standardnotes/scheduler-server", ["workspace:packages/scheduler"]],\
     ["@standardnotes/security", ["workspace:packages/security"]],\
     ["@standardnotes/server-monorepo", ["workspace:."]],\
@@ -126,10 +116,11 @@ const RAW_RUNTIME_STATE =
           ["@lerna-lite/cli", "npm:1.6.0"],\
           ["@lerna-lite/list", "npm:1.6.0"],\
           ["@lerna-lite/run", "npm:1.6.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
-          ["@types/node", "npm:18.11.9"],\
+          ["@types/node", "npm:18.0.3"],\
           ["@typescript-eslint/parser", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:5.40.1"],\
           ["eslint", "npm:8.19.0"],\
           ["eslint-config-prettier", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:8.5.0"],\
@@ -2438,25 +2429,39 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@sentry/core", [\
-      ["npm:7.19.0", {\
+      ["npm:7.5.0", {\
-        "packageLocation": "./.yarn/cache/@sentry-core-npm-7.19.0-151e6173ac-cabd7852ff.zip/node_modules/@sentry/core/",\
+        "packageLocation": "./.yarn/cache/@sentry-core-npm-7.5.0-984c871a50-99c8e93a6f.zip/node_modules/@sentry/core/",\
         "packageDependencies": [\
-          ["@sentry/core", "npm:7.19.0"],\
+          ["@sentry/core", "npm:7.5.0"],\
-          ["@sentry/types", "npm:7.19.0"],\
+          ["@sentry/hub", "npm:7.5.0"],\
-          ["@sentry/utils", "npm:7.19.0"],\
+          ["@sentry/types", "npm:7.5.0"],\
+          ["@sentry/utils", "npm:7.5.0"],\
+          ["tslib", "npm:1.14.1"]\
+        ],\
+        "linkType": "HARD"\
+      }]\
+    ]],\
+    ["@sentry/hub", [\
+      ["npm:7.5.0", {\
+        "packageLocation": "./.yarn/cache/@sentry-hub-npm-7.5.0-993573a68c-27e240423e.zip/node_modules/@sentry/hub/",\
+        "packageDependencies": [\
+          ["@sentry/hub", "npm:7.5.0"],\
+          ["@sentry/types", "npm:7.5.0"],\
+          ["@sentry/utils", "npm:7.5.0"],\
           ["tslib", "npm:1.14.1"]\
         ],\
         "linkType": "HARD"\
       }]\
     ]],\
     ["@sentry/node", [\
-      ["npm:7.19.0", {\
+      ["npm:7.5.0", {\
-        "packageLocation": "./.yarn/cache/@sentry-node-npm-7.19.0-fd3d8dbde1-3a69647d2e.zip/node_modules/@sentry/node/",\
+        "packageLocation": "./.yarn/cache/@sentry-node-npm-7.5.0-a14989f161-9b65bc44d2.zip/node_modules/@sentry/node/",\
         "packageDependencies": [\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
-          ["@sentry/core", "npm:7.19.0"],\
+          ["@sentry/core", "npm:7.5.0"],\
-          ["@sentry/types", "npm:7.19.0"],\
+          ["@sentry/hub", "npm:7.5.0"],\
-          ["@sentry/utils", "npm:7.19.0"],\
+          ["@sentry/types", "npm:7.5.0"],\
+          ["@sentry/utils", "npm:7.5.0"],\
           ["cookie", "npm:0.4.2"],\
           ["https-proxy-agent", "npm:5.0.1"],\
           ["lru_map", "npm:0.3.3"],\
@@ -2466,20 +2471,20 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@sentry/types", [\
-      ["npm:7.19.0", {\
+      ["npm:7.5.0", {\
-        "packageLocation": "./.yarn/cache/@sentry-types-npm-7.19.0-d6ed1960f2-541e1ef49a.zip/node_modules/@sentry/types/",\
+        "packageLocation": "./.yarn/cache/@sentry-types-npm-7.5.0-eea3d326fa-8029b56bae.zip/node_modules/@sentry/types/",\
         "packageDependencies": [\
-          ["@sentry/types", "npm:7.19.0"]\
+          ["@sentry/types", "npm:7.5.0"]\
         ],\
         "linkType": "HARD"\
       }]\
     ]],\
     ["@sentry/utils", [\
-      ["npm:7.19.0", {\
+      ["npm:7.5.0", {\
-        "packageLocation": "./.yarn/cache/@sentry-utils-npm-7.19.0-79844d4d90-50e4f391fe.zip/node_modules/@sentry/utils/",\
+        "packageLocation": "./.yarn/cache/@sentry-utils-npm-7.5.0-e8c66594bc-f5045667ea.zip/node_modules/@sentry/utils/",\
         "packageDependencies": [\
-          ["@sentry/utils", "npm:7.19.0"],\
+          ["@sentry/utils", "npm:7.5.0"],\
-          ["@sentry/types", "npm:7.19.0"],\
+          ["@sentry/types", "npm:7.5.0"],\
           ["tslib", "npm:1.14.1"]\
         ],\
         "linkType": "HARD"\
@@ -2537,32 +2542,35 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/analytics/",\
         "packageDependencies": [\
           ["@standardnotes/analytics", "workspace:packages/analytics"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@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/time", "workspace:packages/time"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
-          ["@types/node", "npm:18.11.9"],\
+          ["@types/node", "npm:18.0.3"],\
+          ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:5.30.5"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["dayjs", "npm:1.11.6"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
           ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
           ["inversify", "npm:6.0.1"],\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
           ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
+          ["shallow-equal-object", "npm:1.1.1"],\
           ["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"],\
+          ["uuid", "npm:9.0.0"],\
           ["winston", "npm:3.8.2"]\
         ],\
         "linkType": "SOFT"\
@@ -2589,8 +2597,9 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/api-gateway/",\
         "packageDependencies": [\
           ["@standardnotes/api-gateway", "workspace:packages/api-gateway"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
@@ -2598,13 +2607,13 @@ const RAW_RUNTIME_STATE =
           ["@standardnotes/time", "workspace:packages/time"],\
           ["@types/cors", "npm:2.8.12"],\
           ["@types/express", "npm:4.17.14"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:8.5.9"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/prettyjson", "npm:0.0.30"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
@@ -2614,7 +2623,7 @@ 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"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:8.5.1"],\
           ["newrelic", "npm:9.6.0"],\
@@ -2645,11 +2654,11 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/auth/",\
         "packageDependencies": [\
           ["@standardnotes/auth-server", "workspace:packages/auth"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@standardnotes/api", "npm:1.19.0"],\
           ["@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/features", "npm:1.53.1"],\
@@ -2663,7 +2672,7 @@ const RAW_RUNTIME_STATE =
           ["@types/bcryptjs", "npm:2.4.2"],\
           ["@types/cors", "npm:2.8.12"],\
           ["@types/express", "npm:4.17.14"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/otplib", "npm:10.0.0"],\
@@ -2671,7 +2680,7 @@ const RAW_RUNTIME_STATE =
           ["@types/ua-parser-js", "npm:0.7.36"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["axios", "npm:1.1.3"],\
           ["bcryptjs", "npm:2.4.3"],\
           ["cors", "npm:2.8.5"],\
@@ -2682,7 +2691,7 @@ const RAW_RUNTIME_STATE =
           ["express", "npm:4.18.2"],\
           ["inversify", "npm:6.0.1"],\
           ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
           ["newrelic", "npm:9.6.0"],\
@@ -2706,8 +2715,9 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/common/",\
         "packageDependencies": [\
           ["@standardnotes/common", "workspace:packages/common"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/node", "npm:18.11.9"],\
+          ["@types/node", "npm:18.0.3"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
@@ -2732,34 +2742,12 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
-    ["@standardnotes/domain-core", [\
-      ["workspace:packages/domain-core", {\
-        "packageLocation": "./packages/domain-core/",\
-        "packageDependencies": [\
-          ["@standardnotes/domain-core", "workspace:packages/domain-core"],\
-          ["@standardnotes/common", "workspace:packages/common"],\
-          ["@standardnotes/features", "npm:1.53.1"],\
-          ["@standardnotes/predicates", "workspace:packages/predicates"],\
-          ["@standardnotes/security", "workspace:packages/security"],\
-          ["@types/jest", "npm:29.1.1"],\
-          ["@types/uuid", "npm:8.3.4"],\
-          ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
-          ["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"]\
-        ],\
-        "linkType": "SOFT"\
-      }]\
-    ]],\
     ["@standardnotes/domain-events", [\
       ["workspace:packages/domain-events", {\
         "packageLocation": "./packages/domain-events/",\
         "packageDependencies": [\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/features", "npm:1.53.1"],\
           ["@standardnotes/predicates", "workspace:packages/predicates"],\
@@ -2780,14 +2768,15 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/domain-events-infra/",\
         "packageDependencies": [\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["newrelic", "npm:9.6.0"],\
           ["reflect-metadata", "npm:0.1.13"],\
@@ -2819,20 +2808,21 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/event-store/",\
         "packageDependencies": [\
           ["@standardnotes/event-store", "workspace:packages/event-store"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
           ["@standardnotes/domain-events-infra", "workspace:packages/domain-events-infra"],\
           ["@standardnotes/time", "workspace:packages/time"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/nodemailer", "npm:6.4.6"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
           ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
           ["inversify", "npm:6.0.1"],\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
           ["newrelic", "npm:9.6.0"],\
@@ -2874,7 +2864,8 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/files/",\
         "packageDependencies": [\
           ["@standardnotes/files-server", "workspace:packages/files"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/config", "npm:2.4.3"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
@@ -2886,14 +2877,14 @@ const RAW_RUNTIME_STATE =
           ["@types/connect-busboy", "npm:1.0.0"],\
           ["@types/cors", "npm:2.8.12"],\
           ["@types/express", "npm:4.17.14"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:8.5.9"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@types/prettyjson", "npm:0.0.30"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["connect-busboy", "npm:1.0.0"],\
           ["cors", "npm:2.8.5"],\
           ["dayjs", "npm:1.11.6"],\
@@ -2905,7 +2896,7 @@ 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"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:8.5.1"],\
           ["newrelic", "npm:9.6.0"],\
@@ -2967,6 +2958,7 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/predicates/",\
         "packageDependencies": [\
           ["@standardnotes/predicates", "workspace:packages/predicates"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
@@ -3003,76 +2995,31 @@ const RAW_RUNTIME_STATE =
         "linkType": "HARD"\
       }]\
     ]],\
-    ["@standardnotes/revisions-server", [\
-      ["workspace:packages/revisions", {\
-        "packageLocation": "./packages/revisions/",\
-        "packageDependencies": [\
-          ["@standardnotes/revisions-server", "workspace:packages/revisions"],\
-          ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
-          ["@standardnotes/api", "npm:1.19.0"],\
-          ["@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/security", "workspace:packages/security"],\
-          ["@standardnotes/time", "workspace:packages/time"],\
-          ["@types/cors", "npm:2.8.12"],\
-          ["@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:7.0.4"],\
-          ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
-          ["cors", "npm:2.8.5"],\
-          ["dotenv", "npm:16.0.1"],\
-          ["eslint", "npm:8.25.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:2.3.3"],\
-          ["newrelic", "npm:9.6.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"],\
-          ["typescript", "patch:typescript@npm%3A4.8.4#optional!builtin<compat/typescript>::version=4.8.4&hash=701156"],\
-          ["winston", "npm:3.8.2"]\
-        ],\
-        "linkType": "SOFT"\
-      }]\
-    ]],\
     ["@standardnotes/scheduler-server", [\
       ["workspace:packages/scheduler", {\
         "packageLocation": "./packages/scheduler/",\
         "packageDependencies": [\
           ["@standardnotes/scheduler-server", "workspace:packages/scheduler"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@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/predicates", "workspace:packages/predicates"],\
           ["@standardnotes/time", "workspace:packages/time"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
-          ["@types/node", "npm:18.11.9"],\
+          ["@types/node", "npm:18.0.3"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["dayjs", "npm:1.11.6"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
           ["eslint-plugin-prettier", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.2.1"],\
           ["inversify", "npm:6.0.1"],\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
           ["newrelic", "npm:9.6.0"],\
@@ -3091,6 +3038,7 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/security/",\
         "packageDependencies": [\
           ["@standardnotes/security", "workspace:packages/security"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:8.5.9"],\
@@ -3115,10 +3063,11 @@ const RAW_RUNTIME_STATE =
           ["@lerna-lite/cli", "npm:1.6.0"],\
           ["@lerna-lite/list", "npm:1.6.0"],\
           ["@lerna-lite/run", "npm:1.6.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
-          ["@types/node", "npm:18.11.9"],\
+          ["@types/node", "npm:18.0.3"],\
           ["@typescript-eslint/parser", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:5.40.1"],\
           ["eslint", "npm:8.19.0"],\
           ["eslint-config-prettier", "virtual:8859b278716fedf3e7458b5628625f7e35678c418626878559a0b816445001b7e24c55546f4677ba4c20b521aa0cf52cc33ac07deff171e383ada6eeab69933f#npm:8.5.0"],\
@@ -3137,6 +3086,7 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/settings/",\
         "packageDependencies": [\
           ["@standardnotes/settings", "workspace:packages/settings"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
           ["reflect-metadata", "npm:0.1.13"],\
@@ -3160,9 +3110,10 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/sncrypto-node/",\
         "packageDependencies": [\
           ["@standardnotes/sncrypto-node", "workspace:packages/sncrypto-node"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@standardnotes/sncrypto-common", "npm:1.13.0"],\
           ["@types/jest", "npm:29.1.1"],\
-          ["@types/node", "npm:18.11.9"],\
+          ["@types/node", "npm:18.0.3"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
           ["eslint-plugin-prettier", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:4.2.1"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
@@ -3180,10 +3131,10 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/syncing-server/",\
         "packageDependencies": [\
           ["@standardnotes/syncing-server", "workspace:packages/syncing-server"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@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/payloads", "npm:1.5.1"],\
@@ -3195,7 +3146,7 @@ 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/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/jsonwebtoken", "npm:8.5.9"],\
           ["@types/newrelic", "npm:7.0.4"],\
@@ -3203,7 +3154,7 @@ const RAW_RUNTIME_STATE =
           ["@types/ua-parser-js", "npm:0.7.36"],\
           ["@types/uuid", "npm:8.3.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
@@ -3213,7 +3164,7 @@ 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"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["jsonwebtoken", "npm:8.5.1"],\
           ["mysql2", "npm:2.3.3"],\
@@ -3237,6 +3188,7 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/time/",\
         "packageDependencies": [\
           ["@standardnotes/time", "workspace:packages/time"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/microtime", "npm:2.1.0"],\
           ["@typescript-eslint/eslint-plugin", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:5.30.5"],\
@@ -3280,8 +3232,9 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/websockets/",\
         "packageDependencies": [\
           ["@standardnotes/websockets-server", "workspace:packages/websockets"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@standardnotes/api", "npm:1.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
@@ -3289,11 +3242,11 @@ const RAW_RUNTIME_STATE =
           ["@standardnotes/security", "workspace:packages/security"],\
           ["@types/cors", "npm:2.8.12"],\
           ["@types/express", "npm:4.17.14"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["axios", "npm:1.1.3"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
@@ -3302,7 +3255,7 @@ const RAW_RUNTIME_STATE =
           ["express", "npm:4.18.2"],\
           ["inversify", "npm:6.0.1"],\
           ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
           ["newrelic", "npm:9.6.0"],\
@@ -3320,8 +3273,9 @@ const RAW_RUNTIME_STATE =
         "packageLocation": "./packages/workspace/",\
         "packageDependencies": [\
           ["@standardnotes/workspace-server", "workspace:packages/workspace"],\
+          ["@newrelic/native-metrics", "npm:9.0.0"],\
           ["@newrelic/winston-enricher", "virtual:c66bf20e88479ada0172094776519a9f51acc4731d22079b60a295bcec7ea42d5545cbce58a77a50d932bf953298799135e99707486e343da6d99ba1d167bdbd#npm:4.0.0"],\
-          ["@sentry/node", "npm:7.19.0"],\
+          ["@sentry/node", "npm:7.5.0"],\
           ["@standardnotes/api", "npm:1.19.0"],\
           ["@standardnotes/common", "workspace:packages/common"],\
           ["@standardnotes/domain-events", "workspace:packages/domain-events"],\
@@ -3331,11 +3285,11 @@ const RAW_RUNTIME_STATE =
           ["@standardnotes/time", "workspace:packages/time"],\
           ["@types/cors", "npm:2.8.12"],\
           ["@types/express", "npm:4.17.14"],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/jest", "npm:29.1.1"],\
           ["@types/newrelic", "npm:7.0.4"],\
           ["@typescript-eslint/eslint-plugin", "virtual:04783e12400851b8a3d76e71495851cc94959db6e62f04cb0a31190080629440b182d8c8eb4d7f2b04e281912f2783a5fd4d2c3c6ab68d38b7097246c93f4c19#npm:5.40.1"],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["cors", "npm:2.8.5"],\
           ["dotenv", "npm:16.0.1"],\
           ["eslint", "npm:8.25.0"],\
@@ -3343,7 +3297,7 @@ const RAW_RUNTIME_STATE =
           ["express", "npm:4.18.2"],\
           ["inversify", "npm:6.0.1"],\
           ["inversify-express-utils", "npm:6.4.3"],\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["jest", "virtual:fd909b174d079e30b336c4ce72c38a88c1e447767b1a8dd7655e07719a1e31b97807f0931368724fc78897ff15e6a6d00b83316c0f76d11f85111f342e08bb79#npm:29.1.2"],\
           ["mysql2", "npm:2.3.3"],\
           ["newrelic", "npm:9.6.0"],\
@@ -3595,11 +3549,11 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["@types/ioredis", [\
-      ["npm:5.0.0", {\
+      ["npm:4.28.10", {\
-        "packageLocation": "./.yarn/cache/@types-ioredis-npm-5.0.0-6efa70abfa-439770c9da.zip/node_modules/@types/ioredis/",\
+        "packageLocation": "./.yarn/cache/@types-ioredis-npm-4.28.10-4bdbe26a79-a7f24a8a13.zip/node_modules/@types/ioredis/",\
         "packageDependencies": [\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
-          ["ioredis", "npm:5.2.4"]\
+          ["@types/node", "npm:18.0.3"]\
         ],\
         "linkType": "HARD"\
       }]\
@@ -3743,13 +3697,6 @@ const RAW_RUNTIME_STATE =
           ["@types/node", "npm:18.0.3"]\
         ],\
         "linkType": "HARD"\
-      }],\
-      ["npm:18.11.9", {\
-        "packageLocation": "./.yarn/cache/@types-node-npm-18.11.9-d21dd6ec05-7b7d90894d.zip/node_modules/@types/node/",\
-        "packageDependencies": [\
-          ["@types/node", "npm:18.11.9"]\
-        ],\
-        "linkType": "HARD"\
       }]\
     ]],\
     ["@types/nodemailer", [\
@@ -4802,10 +4749,10 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["aws-sdk", [\
-      ["npm:2.1260.0", {\
+      ["npm:2.1234.0", {\
-        "packageLocation": "./.yarn/cache/aws-sdk-npm-2.1260.0-0145998ab1-9a1b2e4cb5.zip/node_modules/aws-sdk/",\
+        "packageLocation": "./.yarn/cache/aws-sdk-npm-2.1234.0-7ee3cd4390-cd4b3e8baf.zip/node_modules/aws-sdk/",\
         "packageDependencies": [\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["buffer", "npm:4.9.2"],\
           ["events", "npm:1.1.1"],\
           ["ieee754", "npm:1.1.13"],\
@@ -8323,10 +8270,10 @@ const RAW_RUNTIME_STATE =
       }]\
     ]],\
     ["ioredis", [\
-      ["npm:5.2.4", {\
+      ["npm:5.2.3", {\
-        "packageLocation": "./.yarn/cache/ioredis-npm-5.2.4-875ff55d9a-f6572bf619.zip/node_modules/ioredis/",\
+        "packageLocation": "./.yarn/cache/ioredis-npm-5.2.3-54d9576179-3849fbe54a.zip/node_modules/ioredis/",\
         "packageDependencies": [\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["@ioredis/commands", "npm:1.2.0"],\
           ["cluster-key-slot", "npm:1.1.1"],\
           ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"],\
@@ -12572,7 +12519,7 @@ const RAW_RUNTIME_STATE =
         "packageDependencies": [\
           ["sqs-consumer", "virtual:685a6222c3349423674bb7f0684ba34e2ab20912010f352e04dcf707a156e13183fc382e2417cb37a60f3e7b52fd0178c53181674890e1773eb83e190dc13378#npm:5.7.0"],\
           ["@types/aws-sdk", null],\
-          ["aws-sdk", "npm:2.1260.0"],\
+          ["aws-sdk", "npm:2.1234.0"],\
           ["debug", "virtual:b86a9fb34323a98c6519528ed55faa0d9b44ca8879307c0b29aa384bde47ff59a7d0c9051b31246f14521dfb71ba3c5d6d0b35c29fffc17bf875aa6ad977d9e8#npm:4.3.4"]\
         ],\
         "packagePeers": [\
@@ -13187,7 +13134,7 @@ const RAW_RUNTIME_STATE =
           ["@tsconfig/node12", "npm:1.0.11"],\
           ["@tsconfig/node14", "npm:1.0.3"],\
           ["@tsconfig/node16", "npm:1.0.3"],\
-          ["@types/node", "npm:18.11.9"],\
+          ["@types/node", "npm:18.0.3"],\
           ["@types/swc__core", null],\
           ["@types/swc__wasm", null],\
           ["@types/typescript", null],\
@@ -13463,7 +13410,7 @@ const RAW_RUNTIME_STATE =
           ["@types/better-sqlite3", null],\
           ["@types/google-cloud__spanner", null],\
           ["@types/hdb-pool", null],\
-          ["@types/ioredis", "npm:5.0.0"],\
+          ["@types/ioredis", "npm:4.28.10"],\
           ["@types/mongodb", null],\
           ["@types/mssql", null],\
           ["@types/mysql2", null],\
@@ -13487,7 +13434,7 @@ const RAW_RUNTIME_STATE =
           ["dotenv", "npm:16.0.3"],\
           ["glob", "npm:7.2.3"],\
           ["hdb-pool", null],\
-          ["ioredis", "npm:5.2.4"],\
+          ["ioredis", "npm:5.2.3"],\
           ["js-yaml", "npm:4.1.0"],\
           ["mkdirp", "npm:1.0.4"],\
           ["mongodb", null],\

.prettierrc

@@ -1,6 +0,0 @@
-{
-  "singleQuote": true,
-  "trailingComma": "all",
-  "printWidth": 120,
-  "semi": false
-}

.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.12.1" "-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.12.1/<(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.12.1/include/node/common.gypi "--toplevel-dir=." binding.gyp
+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/16.15.1" "-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/16.15.1/<(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/16.15.1/include/node/common.gypi "--toplevel-dir=." binding.gyp
-Makefile: $(srcdir)/build/config.gypi $(srcdir)/../../../../node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi $(srcdir)/../../../../../../../../Library/Caches/node-gyp/18.12.1/include/node/common.gypi $(srcdir)/binding.gyp
+Makefile: $(srcdir)/binding.gyp $(srcdir)/../../../../node-gyp-npm-9.0.0-0eccfca4d1/node_modules/node-gyp/addon.gypi $(srcdir)/../../../../../../../../Library/Caches/node-gyp/16.15.1/include/node/common.gypi $(srcdir)/build/config.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

@@ -0,0 +1 @@
+cmd_Release/native_metrics.node := c++ -bundle -undefined dynamic_lookup -Wl,-search_paths_first -mmacosx-version-min=10.13 -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 

.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

@@ -0,0 +1,69 @@
+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/16.15.1/include/node -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/src -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/config -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/openssl/include -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/uv/include -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/zlib -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.13 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++14 -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/16.15.1/include/node/node_version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/errno.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/unix.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/threadpool.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/darwin.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/cppgc/common.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8config.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-internal.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-platform.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node_buffer.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/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 \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters_43_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_new.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_implementation_12_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_persistent_12_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_weak.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_object_wrap.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_private.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_typedarray_contents.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_json.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_scriptorigin.h \
+  ../src/Metric.hpp
+../src/GCBinder.cpp:
+../src/GCBinder.hpp:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node_version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/errno.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/unix.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/threadpool.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/darwin.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/cppgc/common.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8config.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-internal.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-platform.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node_buffer.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/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:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters_43_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_new.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_implementation_12_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_persistent_12_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_weak.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_object_wrap.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_private.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_typedarray_contents.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_json.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_scriptorigin.h:
+../src/Metric.hpp:

.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

@@ -0,0 +1,70 @@
+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/16.15.1/include/node -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/src -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/config -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/openssl/include -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/uv/include -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/zlib -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.13 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++14 -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/16.15.1/include/node/uv.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/errno.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/unix.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/threadpool.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/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/16.15.1/include/node/node_version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/cppgc/common.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8config.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-internal.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-platform.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node_buffer.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/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 \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters_43_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_new.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_implementation_12_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_persistent_12_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_weak.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_object_wrap.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_private.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_typedarray_contents.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_json.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_scriptorigin.h \
+  ../src/Metric.hpp
+../src/LoopChecker.cpp:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/errno.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/unix.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/threadpool.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/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/16.15.1/include/node/node_version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/cppgc/common.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8config.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-internal.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-platform.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node_buffer.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/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:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters_43_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_new.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_implementation_12_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_persistent_12_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_weak.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_object_wrap.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_private.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_typedarray_contents.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_json.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_scriptorigin.h:
+../src/Metric.hpp:

.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

@@ -0,0 +1,70 @@
+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/16.15.1/include/node -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/src -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/config -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/openssl/include -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/uv/include -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/zlib -I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/v8/include -I../src -I../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan  -O3 -gdwarf-2 -mmacosx-version-min=10.13 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -std=gnu++14 -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/16.15.1/include/node/node_version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/errno.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/unix.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/threadpool.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/darwin.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/cppgc/common.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8config.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-internal.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-version.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-platform.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node_buffer.h \
+  /Users/karolsojko/Library/Caches/node-gyp/16.15.1/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 \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters_43_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_new.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_implementation_12_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_persistent_12_inl.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_weak.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_object_wrap.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_private.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_typedarray_contents.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_json.h \
+  ../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_scriptorigin.h \
+  ../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/16.15.1/include/node/node_version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/errno.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/unix.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/threadpool.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/uv/darwin.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/cppgc/common.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8config.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-internal.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-version.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/v8-platform.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node/node_buffer.h:
+/Users/karolsojko/Library/Caches/node-gyp/16.15.1/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:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_converters_43_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_new.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_implementation_12_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_persistent_12_inl.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_weak.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_object_wrap.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_private.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_typedarray_contents.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_json.h:
+../../../../../nan-npm-2.16.0-cac314a230/node_modules/nan/nan_scriptorigin.h:
+../src/GCBinder.hpp:
+../src/Metric.hpp:
+../src/LoopChecker.hpp:

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

@@ -19,316 +19,293 @@
     "error_on_warn": "false",
     "force_dynamic_crt": 0,
     "host_arch": "x64",
-    "icu_data_in": "../../deps/icu-tmp/icudt71l.dat",
+    "icu_data_in": "../../deps/icu-tmp/icudt70l.dat",
     "icu_endianness": "l",
     "icu_gyp_path": "tools/icu/icu-generic.gyp",
     "icu_path": "deps/icu-small",
     "icu_small": "false",
-    "icu_ver_major": "71",
+    "icu_ver_major": "70",
     "is_debug": 0,
-    "libdir": "lib",
     "llvm_version": "11.0",
     "napi_build_version": "8",
     "node_byteorder": "little",
     "node_debug_lib": "false",
     "node_enable_d8": "false",
-    "node_fipsinstall": "false",
     "node_install_corepack": "true",
     "node_install_npm": "true",
     "node_library_files": [
-      "lib/_http_agent.js",
-      "lib/_http_client.js",
-      "lib/_http_common.js",
-      "lib/_http_incoming.js",
-      "lib/_http_outgoing.js",
-      "lib/_http_server.js",
-      "lib/_stream_duplex.js",
-      "lib/_stream_passthrough.js",
-      "lib/_stream_readable.js",
-      "lib/_stream_transform.js",
-      "lib/_stream_wrap.js",
-      "lib/_stream_writable.js",
-      "lib/_tls_common.js",
-      "lib/_tls_wrap.js",
-      "lib/assert.js",
-      "lib/assert/strict.js",
-      "lib/async_hooks.js",
-      "lib/buffer.js",
-      "lib/child_process.js",
-      "lib/cluster.js",
-      "lib/console.js",
       "lib/constants.js",
-      "lib/crypto.js",
-      "lib/dgram.js",
-      "lib/diagnostics_channel.js",
-      "lib/dns.js",
-      "lib/dns/promises.js",
-      "lib/domain.js",
-      "lib/events.js",
-      "lib/fs.js",
-      "lib/fs/promises.js",
-      "lib/http.js",
-      "lib/http2.js",
-      "lib/https.js",
-      "lib/inspector.js",
-      "lib/internal/abort_controller.js",
-      "lib/internal/assert.js",
-      "lib/internal/assert/assertion_error.js",
-      "lib/internal/assert/calltracker.js",
-      "lib/internal/assert/snapshot.js",
-      "lib/internal/async_hooks.js",
-      "lib/internal/blob.js",
-      "lib/internal/blocklist.js",
-      "lib/internal/bootstrap/browser.js",
-      "lib/internal/bootstrap/loaders.js",
-      "lib/internal/bootstrap/node.js",
-      "lib/internal/bootstrap/switches/does_not_own_process_state.js",
-      "lib/internal/bootstrap/switches/does_own_process_state.js",
-      "lib/internal/bootstrap/switches/is_main_thread.js",
-      "lib/internal/bootstrap/switches/is_not_main_thread.js",
-      "lib/internal/buffer.js",
-      "lib/internal/child_process.js",
-      "lib/internal/child_process/serialization.js",
-      "lib/internal/cli_table.js",
-      "lib/internal/cluster/child.js",
-      "lib/internal/cluster/primary.js",
-      "lib/internal/cluster/round_robin_handle.js",
-      "lib/internal/cluster/shared_handle.js",
-      "lib/internal/cluster/utils.js",
-      "lib/internal/cluster/worker.js",
-      "lib/internal/console/constructor.js",
-      "lib/internal/console/global.js",
-      "lib/internal/constants.js",
-      "lib/internal/crypto/aes.js",
-      "lib/internal/crypto/certificate.js",
-      "lib/internal/crypto/cfrg.js",
-      "lib/internal/crypto/cipher.js",
-      "lib/internal/crypto/diffiehellman.js",
-      "lib/internal/crypto/ec.js",
-      "lib/internal/crypto/hash.js",
-      "lib/internal/crypto/hashnames.js",
-      "lib/internal/crypto/hkdf.js",
-      "lib/internal/crypto/keygen.js",
-      "lib/internal/crypto/keys.js",
-      "lib/internal/crypto/mac.js",
-      "lib/internal/crypto/pbkdf2.js",
-      "lib/internal/crypto/random.js",
-      "lib/internal/crypto/rsa.js",
-      "lib/internal/crypto/scrypt.js",
-      "lib/internal/crypto/sig.js",
-      "lib/internal/crypto/util.js",
-      "lib/internal/crypto/webcrypto.js",
-      "lib/internal/crypto/x509.js",
-      "lib/internal/debugger/inspect.js",
-      "lib/internal/debugger/inspect_client.js",
-      "lib/internal/debugger/inspect_repl.js",
-      "lib/internal/dgram.js",
-      "lib/internal/dns/callback_resolver.js",
-      "lib/internal/dns/promises.js",
-      "lib/internal/dns/utils.js",
-      "lib/internal/dtrace.js",
-      "lib/internal/encoding.js",
-      "lib/internal/error_serdes.js",
-      "lib/internal/errors.js",
-      "lib/internal/event_target.js",
-      "lib/internal/fixed_queue.js",
-      "lib/internal/freelist.js",
-      "lib/internal/freeze_intrinsics.js",
-      "lib/internal/fs/cp/cp-sync.js",
-      "lib/internal/fs/cp/cp.js",
-      "lib/internal/fs/dir.js",
-      "lib/internal/fs/promises.js",
-      "lib/internal/fs/read_file_context.js",
-      "lib/internal/fs/rimraf.js",
-      "lib/internal/fs/streams.js",
-      "lib/internal/fs/sync_write_stream.js",
-      "lib/internal/fs/utils.js",
-      "lib/internal/fs/watchers.js",
-      "lib/internal/heap_utils.js",
-      "lib/internal/histogram.js",
-      "lib/internal/http.js",
-      "lib/internal/http2/compat.js",
-      "lib/internal/http2/core.js",
-      "lib/internal/http2/util.js",
-      "lib/internal/idna.js",
-      "lib/internal/inspector_async_hook.js",
-      "lib/internal/js_stream_socket.js",
-      "lib/internal/legacy/processbinding.js",
-      "lib/internal/linkedlist.js",
-      "lib/internal/main/check_syntax.js",
-      "lib/internal/main/environment.js",
-      "lib/internal/main/eval_stdin.js",
-      "lib/internal/main/eval_string.js",
-      "lib/internal/main/inspect.js",
-      "lib/internal/main/mksnapshot.js",
-      "lib/internal/main/print_help.js",
-      "lib/internal/main/prof_process.js",
-      "lib/internal/main/repl.js",
-      "lib/internal/main/run_main_module.js",
-      "lib/internal/main/test_runner.js",
-      "lib/internal/main/watch_mode.js",
-      "lib/internal/main/worker_thread.js",
-      "lib/internal/modules/cjs/helpers.js",
-      "lib/internal/modules/cjs/loader.js",
-      "lib/internal/modules/esm/assert.js",
-      "lib/internal/modules/esm/create_dynamic_module.js",
-      "lib/internal/modules/esm/fetch_module.js",
-      "lib/internal/modules/esm/formats.js",
-      "lib/internal/modules/esm/get_format.js",
-      "lib/internal/modules/esm/handle_process_exit.js",
-      "lib/internal/modules/esm/initialize_import_meta.js",
-      "lib/internal/modules/esm/load.js",
-      "lib/internal/modules/esm/loader.js",
-      "lib/internal/modules/esm/module_job.js",
-      "lib/internal/modules/esm/module_map.js",
-      "lib/internal/modules/esm/package_config.js",
-      "lib/internal/modules/esm/resolve.js",
-      "lib/internal/modules/esm/translators.js",
-      "lib/internal/modules/package_json_reader.js",
-      "lib/internal/modules/run_main.js",
-      "lib/internal/net.js",
-      "lib/internal/options.js",
-      "lib/internal/per_context/domexception.js",
-      "lib/internal/per_context/messageport.js",
-      "lib/internal/per_context/primordials.js",
-      "lib/internal/perf/event_loop_delay.js",
-      "lib/internal/perf/event_loop_utilization.js",
-      "lib/internal/perf/nodetiming.js",
-      "lib/internal/perf/observe.js",
-      "lib/internal/perf/performance.js",
-      "lib/internal/perf/performance_entry.js",
-      "lib/internal/perf/resource_timing.js",
-      "lib/internal/perf/timerify.js",
-      "lib/internal/perf/usertiming.js",
-      "lib/internal/perf/utils.js",
-      "lib/internal/policy/manifest.js",
-      "lib/internal/policy/sri.js",
-      "lib/internal/priority_queue.js",
-      "lib/internal/process/esm_loader.js",
-      "lib/internal/process/execution.js",
-      "lib/internal/process/per_thread.js",
-      "lib/internal/process/policy.js",
-      "lib/internal/process/pre_execution.js",
-      "lib/internal/process/promises.js",
-      "lib/internal/process/report.js",
-      "lib/internal/process/signal.js",
-      "lib/internal/process/task_queues.js",
-      "lib/internal/process/warning.js",
-      "lib/internal/process/worker_thread_only.js",
-      "lib/internal/promise_hooks.js",
-      "lib/internal/querystring.js",
-      "lib/internal/readline/callbacks.js",
-      "lib/internal/readline/emitKeypressEvents.js",
-      "lib/internal/readline/interface.js",
-      "lib/internal/readline/promises.js",
-      "lib/internal/readline/utils.js",
-      "lib/internal/repl.js",
-      "lib/internal/repl/await.js",
-      "lib/internal/repl/history.js",
-      "lib/internal/repl/utils.js",
-      "lib/internal/socket_list.js",
-      "lib/internal/socketaddress.js",
-      "lib/internal/source_map/prepare_stack_trace.js",
-      "lib/internal/source_map/source_map.js",
-      "lib/internal/source_map/source_map_cache.js",
-      "lib/internal/stream_base_commons.js",
-      "lib/internal/streams/add-abort-signal.js",
-      "lib/internal/streams/buffer_list.js",
-      "lib/internal/streams/compose.js",
-      "lib/internal/streams/destroy.js",
-      "lib/internal/streams/duplex.js",
-      "lib/internal/streams/duplexify.js",
-      "lib/internal/streams/end-of-stream.js",
-      "lib/internal/streams/from.js",
-      "lib/internal/streams/lazy_transform.js",
-      "lib/internal/streams/legacy.js",
-      "lib/internal/streams/operators.js",
-      "lib/internal/streams/passthrough.js",
-      "lib/internal/streams/pipeline.js",
-      "lib/internal/streams/readable.js",
-      "lib/internal/streams/state.js",
-      "lib/internal/streams/transform.js",
-      "lib/internal/streams/utils.js",
-      "lib/internal/streams/writable.js",
-      "lib/internal/structured_clone.js",
-      "lib/internal/test/binding.js",
-      "lib/internal/test/transfer.js",
-      "lib/internal/test_runner/harness.js",
-      "lib/internal/test_runner/runner.js",
-      "lib/internal/test_runner/tap_stream.js",
-      "lib/internal/test_runner/test.js",
-      "lib/internal/test_runner/utils.js",
-      "lib/internal/timers.js",
-      "lib/internal/tls/secure-context.js",
-      "lib/internal/tls/secure-pair.js",
-      "lib/internal/trace_events_async_hooks.js",
-      "lib/internal/tty.js",
-      "lib/internal/url.js",
-      "lib/internal/util.js",
-      "lib/internal/util/colors.js",
-      "lib/internal/util/comparisons.js",
-      "lib/internal/util/debuglog.js",
-      "lib/internal/util/inspect.js",
-      "lib/internal/util/inspector.js",
-      "lib/internal/util/iterable_weak_map.js",
-      "lib/internal/util/parse_args/parse_args.js",
-      "lib/internal/util/parse_args/utils.js",
-      "lib/internal/util/types.js",
-      "lib/internal/v8/startup_snapshot.js",
-      "lib/internal/v8_prof_polyfill.js",
-      "lib/internal/v8_prof_processor.js",
-      "lib/internal/validators.js",
-      "lib/internal/vm/module.js",
-      "lib/internal/wasm_web_api.js",
-      "lib/internal/watch_mode/files_watcher.js",
-      "lib/internal/watchdog.js",
-      "lib/internal/webstreams/adapters.js",
-      "lib/internal/webstreams/compression.js",
-      "lib/internal/webstreams/encoding.js",
-      "lib/internal/webstreams/queuingstrategies.js",
-      "lib/internal/webstreams/readablestream.js",
-      "lib/internal/webstreams/transfer.js",
-      "lib/internal/webstreams/transformstream.js",
-      "lib/internal/webstreams/util.js",
-      "lib/internal/webstreams/writablestream.js",
-      "lib/internal/worker.js",
-      "lib/internal/worker/io.js",
-      "lib/internal/worker/js_transferable.js",
-      "lib/module.js",
       "lib/net.js",
-      "lib/os.js",
+      "lib/trace_events.js",
-      "lib/path.js",
+      "lib/events.js",
-      "lib/path/posix.js",
-      "lib/path/win32.js",
-      "lib/perf_hooks.js",
-      "lib/process.js",
-      "lib/punycode.js",
-      "lib/querystring.js",
-      "lib/readline.js",
-      "lib/readline/promises.js",
       "lib/repl.js",
+      "lib/util.js",
+      "lib/dgram.js",
+      "lib/vm.js",
       "lib/stream.js",
+      "lib/child_process.js",
+      "lib/assert.js",
+      "lib/_tls_wrap.js",
+      "lib/http2.js",
+      "lib/inspector.js",
+      "lib/os.js",
+      "lib/_http_server.js",
+      "lib/console.js",
+      "lib/perf_hooks.js",
+      "lib/readline.js",
+      "lib/punycode.js",
+      "lib/_http_incoming.js",
+      "lib/https.js",
+      "lib/_stream_wrap.js",
+      "lib/domain.js",
+      "lib/dns.js",
+      "lib/_http_client.js",
+      "lib/diagnostics_channel.js",
+      "lib/tty.js",
+      "lib/_http_agent.js",
+      "lib/timers.js",
+      "lib/_http_outgoing.js",
+      "lib/querystring.js",
+      "lib/_tls_common.js",
+      "lib/module.js",
+      "lib/_stream_passthrough.js",
+      "lib/_stream_transform.js",
+      "lib/worker_threads.js",
+      "lib/sys.js",
+      "lib/_stream_duplex.js",
+      "lib/path.js",
+      "lib/_http_common.js",
+      "lib/string_decoder.js",
+      "lib/cluster.js",
+      "lib/v8.js",
+      "lib/crypto.js",
+      "lib/wasi.js",
+      "lib/_stream_readable.js",
+      "lib/zlib.js",
+      "lib/url.js",
+      "lib/tls.js",
+      "lib/_stream_writable.js",
+      "lib/async_hooks.js",
+      "lib/process.js",
+      "lib/http.js",
+      "lib/buffer.js",
+      "lib/fs.js",
+      "lib/util/types.js",
+      "lib/timers/promises.js",
+      "lib/path/win32.js",
+      "lib/path/posix.js",
       "lib/stream/consumers.js",
       "lib/stream/promises.js",
       "lib/stream/web.js",
-      "lib/string_decoder.js",
+      "lib/internal/constants.js",
-      "lib/sys.js",
+      "lib/internal/abort_controller.js",
-      "lib/test.js",
+      "lib/internal/net.js",
-      "lib/timers.js",
+      "lib/internal/v8_prof_processor.js",
-      "lib/timers/promises.js",
+      "lib/internal/event_target.js",
-      "lib/tls.js",
+      "lib/internal/inspector_async_hook.js",
-      "lib/trace_events.js",
+      "lib/internal/validators.js",
-      "lib/tty.js",
+      "lib/internal/linkedlist.js",
-      "lib/url.js",
+      "lib/internal/cli_table.js",
-      "lib/util.js",
+      "lib/internal/repl.js",
-      "lib/util/types.js",
+      "lib/internal/util.js",
-      "lib/v8.js",
+      "lib/internal/histogram.js",
-      "lib/vm.js",
+      "lib/internal/error_serdes.js",
-      "lib/wasi.js",
+      "lib/internal/dgram.js",
-      "lib/worker_threads.js",
+      "lib/internal/child_process.js",
-      "lib/zlib.js"
+      "lib/internal/assert.js",
+      "lib/internal/fixed_queue.js",
+      "lib/internal/blocklist.js",
+      "lib/internal/v8_prof_polyfill.js",
+      "lib/internal/options.js",
+      "lib/internal/worker.js",
+      "lib/internal/dtrace.js",
+      "lib/internal/idna.js",
+      "lib/internal/watchdog.js",
+      "lib/internal/encoding.js",
+      "lib/internal/tty.js",
+      "lib/internal/freeze_intrinsics.js",
+      "lib/internal/timers.js",
+      "lib/internal/heap_utils.js",
+      "lib/internal/querystring.js",
+      "lib/internal/js_stream_socket.js",
+      "lib/internal/errors.js",
+      "lib/internal/priority_queue.js",
+      "lib/internal/freelist.js",
+      "lib/internal/blob.js",
+      "lib/internal/socket_list.js",
+      "lib/internal/socketaddress.js",
+      "lib/internal/promise_hooks.js",
+      "lib/internal/stream_base_commons.js",
+      "lib/internal/url.js",
+      "lib/internal/async_hooks.js",
+      "lib/internal/http.js",
+      "lib/internal/buffer.js",
+      "lib/internal/trace_events_async_hooks.js",
+      "lib/internal/crypto/sig.js",
+      "lib/internal/crypto/rsa.js",
+      "lib/internal/crypto/aes.js",
+      "lib/internal/crypto/util.js",
+      "lib/internal/crypto/scrypt.js",
+      "lib/internal/crypto/random.js",
+      "lib/internal/crypto/keys.js",
+      "lib/internal/crypto/x509.js",
+      "lib/internal/crypto/certificate.js",
+      "lib/internal/crypto/ec.js",
+      "lib/internal/crypto/keygen.js",
+      "lib/internal/crypto/mac.js",
+      "lib/internal/crypto/diffiehellman.js",
+      "lib/internal/crypto/hkdf.js",
+      "lib/internal/crypto/cipher.js",
+      "lib/internal/crypto/hash.js",
+      "lib/internal/crypto/pbkdf2.js",
+      "lib/internal/crypto/webcrypto.js",
+      "lib/internal/crypto/dsa.js",
+      "lib/internal/crypto/hashnames.js",
+      "lib/internal/cluster/shared_handle.js",
+      "lib/internal/cluster/round_robin_handle.js",
+      "lib/internal/cluster/worker.js",
+      "lib/internal/cluster/primary.js",
+      "lib/internal/cluster/utils.js",
+      "lib/internal/cluster/child.js",
+      "lib/internal/webstreams/compression.js",
+      "lib/internal/webstreams/util.js",
+      "lib/internal/webstreams/writablestream.js",
+      "lib/internal/webstreams/readablestream.js",
+      "lib/internal/webstreams/queuingstrategies.js",
+      "lib/internal/webstreams/encoding.js",
+      "lib/internal/webstreams/transformstream.js",
+      "lib/internal/webstreams/adapters.js",
+      "lib/internal/webstreams/transfer.js",
+      "lib/internal/bootstrap/loaders.js",
+      "lib/internal/bootstrap/pre_execution.js",
+      "lib/internal/bootstrap/node.js",
+      "lib/internal/bootstrap/environment.js",
+      "lib/internal/bootstrap/switches/does_not_own_process_state.js",
+      "lib/internal/bootstrap/switches/is_not_main_thread.js",
+      "lib/internal/bootstrap/switches/does_own_process_state.js",
+      "lib/internal/bootstrap/switches/is_main_thread.js",
+      "lib/internal/test/binding.js",
+      "lib/internal/test/transfer.js",
+      "lib/internal/util/types.js",
+      "lib/internal/util/inspector.js",
+      "lib/internal/util/comparisons.js",
+      "lib/internal/util/debuglog.js",
+      "lib/internal/util/inspect.js",
+      "lib/internal/util/iterable_weak_map.js",
+      "lib/internal/streams/add-abort-signal.js",
+      "lib/internal/streams/compose.js",
+      "lib/internal/streams/duplexify.js",
+      "lib/internal/streams/destroy.js",
+      "lib/internal/streams/legacy.js",
+      "lib/internal/streams/passthrough.js",
+      "lib/internal/streams/operators.js",
+      "lib/internal/streams/readable.js",
+      "lib/internal/streams/from.js",
+      "lib/internal/streams/writable.js",
+      "lib/internal/streams/state.js",
+      "lib/internal/streams/buffer_list.js",
+      "lib/internal/streams/end-of-stream.js",
+      "lib/internal/streams/utils.js",
+      "lib/internal/streams/transform.js",
+      "lib/internal/streams/lazy_transform.js",
+      "lib/internal/streams/duplex.js",
+      "lib/internal/streams/pipeline.js",
+      "lib/internal/readline/interface.js",
+      "lib/internal/readline/utils.js",
+      "lib/internal/readline/emitKeypressEvents.js",
+      "lib/internal/readline/callbacks.js",
+      "lib/internal/repl/history.js",
+      "lib/internal/repl/utils.js",
+      "lib/internal/repl/await.js",
+      "lib/internal/legacy/processbinding.js",
+      "lib/internal/assert/calltracker.js",
+      "lib/internal/assert/assertion_error.js",
+      "lib/internal/http2/util.js",
+      "lib/internal/http2/core.js",
+      "lib/internal/http2/compat.js",
+      "lib/internal/per_context/messageport.js",
+      "lib/internal/per_context/primordials.js",
+      "lib/internal/per_context/domexception.js",
+      "lib/internal/vm/module.js",
+      "lib/internal/tls/secure-pair.js",
+      "lib/internal/tls/parse-cert-string.js",
+      "lib/internal/tls/secure-context.js",
+      "lib/internal/child_process/serialization.js",
+      "lib/internal/debugger/inspect_repl.js",
+      "lib/internal/debugger/inspect_client.js",
+      "lib/internal/debugger/inspect.js",
+      "lib/internal/worker/io.js",
+      "lib/internal/worker/js_transferable.js",
+      "lib/internal/main/repl.js",
+      "lib/internal/main/print_help.js",
+      "lib/internal/main/eval_string.js",
+      "lib/internal/main/check_syntax.js",
+      "lib/internal/main/prof_process.js",
+      "lib/internal/main/worker_thread.js",
+      "lib/internal/main/inspect.js",
+      "lib/internal/main/eval_stdin.js",
+      "lib/internal/main/run_main_module.js",
+      "lib/internal/modules/run_main.js",
+      "lib/internal/modules/package_json_reader.js",
+      "lib/internal/modules/esm/module_job.js",
+      "lib/internal/modules/esm/assert.js",
+      "lib/internal/modules/esm/fetch_module.js",
+      "lib/internal/modules/esm/get_source.js",
+      "lib/internal/modules/esm/translators.js",
+      "lib/internal/modules/esm/resolve.js",
+      "lib/internal/modules/esm/create_dynamic_module.js",
+      "lib/internal/modules/esm/load.js",
+      "lib/internal/modules/esm/handle_process_exit.js",
+      "lib/internal/modules/esm/initialize_import_meta.js",
+      "lib/internal/modules/esm/module_map.js",
+      "lib/internal/modules/esm/get_format.js",
+      "lib/internal/modules/esm/formats.js",
+      "lib/internal/modules/esm/loader.js",
+      "lib/internal/modules/cjs/helpers.js",
+      "lib/internal/modules/cjs/loader.js",
+      "lib/internal/source_map/source_map.js",
+      "lib/internal/source_map/prepare_stack_trace.js",
+      "lib/internal/source_map/source_map_cache.js",
+      "lib/internal/dns/promises.js",
+      "lib/internal/dns/utils.js",
+      "lib/internal/fs/watchers.js",
+      "lib/internal/fs/promises.js",
+      "lib/internal/fs/read_file_context.js",
+      "lib/internal/fs/rimraf.js",
+      "lib/internal/fs/sync_write_stream.js",
+      "lib/internal/fs/dir.js",
+      "lib/internal/fs/streams.js",
+      "lib/internal/fs/utils.js",
+      "lib/internal/fs/cp/cp.js",
+      "lib/internal/fs/cp/cp-sync.js",
+      "lib/internal/perf/nodetiming.js",
+      "lib/internal/perf/usertiming.js",
+      "lib/internal/perf/performance_entry.js",
+      "lib/internal/perf/performance.js",
+      "lib/internal/perf/timerify.js",
+      "lib/internal/perf/utils.js",
+      "lib/internal/perf/observe.js",
+      "lib/internal/perf/event_loop_delay.js",
+      "lib/internal/perf/event_loop_utilization.js",
+      "lib/internal/policy/manifest.js",
+      "lib/internal/policy/sri.js",
+      "lib/internal/process/task_queues.js",
+      "lib/internal/process/per_thread.js",
+      "lib/internal/process/warning.js",
+      "lib/internal/process/policy.js",
+      "lib/internal/process/promises.js",
+      "lib/internal/process/signal.js",
+      "lib/internal/process/execution.js",
+      "lib/internal/process/esm_loader.js",
+      "lib/internal/process/report.js",
+      "lib/internal/process/worker_thread_only.js",
+      "lib/internal/console/constructor.js",
+      "lib/internal/console/global.js",
+      "lib/assert/strict.js",
+      "lib/dns/promises.js",
+      "lib/fs/promises.js"
     ],
-    "node_module_version": 108,
+    "node_module_version": 93,
     "node_no_browser_globals": "false",
     "node_prefix": "/",
     "node_release_urlbase": "https://nodejs.org/download/release/",
@@ -353,22 +330,20 @@
     "node_use_v8_platform": "true",
     "node_with_ltcg": "false",
     "node_without_node_options": "false",
+    "openssl_fips": "",
     "openssl_is_fips": "false",
     "openssl_quic": "true",
     "ossfuzz": "false",
-    "shlib_suffix": "108.dylib",
+    "shlib_suffix": "93.dylib",
     "target_arch": "x64",
     "v8_enable_31bit_smis_on_64bit_arch": 0,
     "v8_enable_gdbjit": 0,
     "v8_enable_hugepage": 0,
     "v8_enable_i18n_support": 1,
     "v8_enable_inspector": 1,
-    "v8_enable_javascript_promise_hooks": 1,
     "v8_enable_lite_mode": 0,
     "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,
@@ -378,8 +353,8 @@
     "v8_use_siphash": 1,
     "want_separate_host_toolset": 0,
     "xcode_version": "11.0",
-    "nodedir": "/Users/karolsojko/Library/Caches/node-gyp/18.12.1",
+    "nodedir": "/Users/karolsojko/Library/Caches/node-gyp/16.15.1",
     "standalone_static_library": 1,
-    "user_agent": "yarn/4.0.0-rc.25 npm/? node/v18.12.1 darwin x64"
+    "user_agent": "yarn/3.2.1 npm/? node/v16.15.1 darwin x64"
   }
 }

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

@@ -25,7 +25,7 @@ DEFS_Debug := \
 CFLAGS_Debug := \
 	-O0 \
 	-gdwarf-2 \
-	-mmacosx-version-min=10.15 \
+	-mmacosx-version-min=10.13 \
 	-arch x86_64 \
 	-Wall \
 	-Wendif-labels \
@@ -38,7 +38,7 @@ CFLAGS_C_Debug := \
 
 # Flags passed to only C++ files.
 CFLAGS_CC_Debug := \
-	-std=gnu++17 \
+	-std=gnu++14 \
 	-stdlib=libc++ \
 	-fno-rtti \
 	-fno-exceptions \
@@ -51,13 +51,13 @@ CFLAGS_OBJC_Debug :=
 CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/include/node \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/src \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/src \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/openssl/config \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/config \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/openssl/openssl/include \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/openssl/include \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/uv/include \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/uv/include \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/zlib \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/zlib \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/v8/include \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/v8/include \
 	-I$(srcdir)/src \
 	-I$(srcdir)/../../../../nan-npm-2.16.0-cac314a230/node_modules/nan
 
@@ -81,7 +81,7 @@ DEFS_Release := \
 CFLAGS_Release := \
 	-O3 \
 	-gdwarf-2 \
-	-mmacosx-version-min=10.15 \
+	-mmacosx-version-min=10.13 \
 	-arch x86_64 \
 	-Wall \
 	-Wendif-labels \
@@ -94,7 +94,7 @@ CFLAGS_C_Release := \
 
 # Flags passed to only C++ files.
 CFLAGS_CC_Release := \
-	-std=gnu++17 \
+	-std=gnu++14 \
 	-stdlib=libc++ \
 	-fno-rtti \
 	-fno-exceptions \
@@ -107,13 +107,13 @@ CFLAGS_OBJC_Release :=
 CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/include/node \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/include/node \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/src \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/src \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/openssl/config \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/config \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/openssl/openssl/include \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/openssl/openssl/include \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/uv/include \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/uv/include \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/zlib \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/zlib \
-	-I/Users/karolsojko/Library/Caches/node-gyp/18.12.1/deps/v8/include \
+	-I/Users/karolsojko/Library/Caches/node-gyp/16.15.1/deps/v8/include \
 	-I$(srcdir)/src \
 	-I$(srcdir)/../../../../nan-npm-2.16.0-cac314a230/node_modules/nan
 
@@ -151,7 +151,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cpp FORCE_DO_CMD
 LDFLAGS_Debug := \
 	-undefined dynamic_lookup \
 	-Wl,-search_paths_first \
-	-mmacosx-version-min=10.15 \
+	-mmacosx-version-min=10.13 \
 	-arch x86_64 \
 	-L$(builddir) \
 	-stdlib=libc++
@@ -163,7 +163,7 @@ LIBTOOLFLAGS_Debug := \
 LDFLAGS_Release := \
 	-undefined dynamic_lookup \
 	-Wl,-search_paths_first \
-	-mmacosx-version-min=10.15 \
+	-mmacosx-version-min=10.13 \
 	-arch x86_64 \
 	-L$(builddir) \
 	-stdlib=libc++

package.json

@@ -8,7 +8,7 @@
     ]
   },
   "engines": {
-    "node": ">=18.0.0 <19.0.0"
+    "node": ">=16.0.0 <17.0.0"
   },
   "scripts": {
     "lint": "yarn workspaces foreach -p -j 10 --verbose run lint",
@@ -21,7 +21,6 @@
     "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",
@@ -35,7 +34,6 @@
     "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",
@@ -49,7 +47,7 @@
     "@lerna-lite/run": "^1.5.1",
     "@types/jest": "^29.1.1",
     "@types/newrelic": "^7.0.4",
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.0.0",
     "@typescript-eslint/parser": "^5.40.1",
     "eslint": "^8.17.0",
     "eslint-config-prettier": "^8.5.0",
@@ -61,7 +59,8 @@
   },
   "packageManager": "yarn@4.0.0-rc.25",
   "dependencies": {
-    "@sentry/node": "^7.19.0",
+    "@newrelic/native-metrics": "^9.0.0",
+    "@sentry/node": "^7.3.0",
     "newrelic": "^9.6.0"
   }
 }

packages/analytics/CHANGELOG.md

@@ -3,154 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [2.12.8](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.7...@standardnotes/analytics@2.12.8) (2022-12-08)
+## [2.9.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.6...@standardnotes/analytics@2.9.7) (2022-11-14)
 
 **Note:** Version bump only for package @standardnotes/analytics
 
-## [2.12.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.6...@standardnotes/analytics@2.12.7) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.12.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.5...@standardnotes/analytics@2.12.6) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.12.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.4...@standardnotes/analytics@2.12.5) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.12.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.3...@standardnotes/analytics@2.12.4) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.12.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.2...@standardnotes/analytics@2.12.3) (2022-12-06)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.12.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.1...@standardnotes/analytics@2.12.2) (2022-12-05)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.12.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.12.0...@standardnotes/analytics@2.12.1) (2022-12-05)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-# [2.12.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.17...@standardnotes/analytics@2.12.0) (2022-12-05)
-
-### Features
-
-* **domain-core:** distinguish between username and email ([06fd404](https://github.com/standardnotes/server/commit/06fd404d44b44a53733f889aabd4da63f21e2f36))
-
-## [2.11.17](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.16...@standardnotes/analytics@2.11.17) (2022-12-02)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.16](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.15...@standardnotes/analytics@2.11.16) (2022-12-02)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.15](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.14...@standardnotes/analytics@2.11.15) (2022-11-30)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.14](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.13...@standardnotes/analytics@2.11.14) (2022-11-28)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.13](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.12...@standardnotes/analytics@2.11.13) (2022-11-25)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.12](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.11...@standardnotes/analytics@2.11.12) (2022-11-24)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.11](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.10...@standardnotes/analytics@2.11.11) (2022-11-24)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.10](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.9...@standardnotes/analytics@2.11.10) (2022-11-24)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.9](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.8...@standardnotes/analytics@2.11.9) (2022-11-24)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.8](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.7...@standardnotes/analytics@2.11.8) (2022-11-23)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.7](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.6...@standardnotes/analytics@2.11.7) (2022-11-23)
-
-### Bug Fixes
-
-* binding of sns and sqs with additional config ([74bc791](https://github.com/standardnotes/server/commit/74bc79116bc50d9a5af1a558db1b7108dcda6d0e))
-
-## [2.11.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.5...@standardnotes/analytics@2.11.6) (2022-11-22)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.5](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.4...@standardnotes/analytics@2.11.5) (2022-11-21)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.4](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.3...@standardnotes/analytics@2.11.4) (2022-11-21)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.2...@standardnotes/analytics@2.11.3) (2022-11-18)
-
-**Note:** Version bump only for package @standardnotes/analytics
-
-## [2.11.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.1...@standardnotes/analytics@2.11.2) (2022-11-18)
-
-### Bug Fixes
-
-* **analytics:** specs ([507d43b](https://github.com/standardnotes/server/commit/507d43b3289d1e178644df6d3e15d1d55e56c7bb))
-
-## [2.11.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.11.0...@standardnotes/analytics@2.11.1) (2022-11-18)
-
-### Bug Fixes
-
-* mapper interface imports ([1ec0723](https://github.com/standardnotes/server/commit/1ec072373d640c4e2f24b9bb12fec0c678b48032))
-
-# [2.11.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.3...@standardnotes/analytics@2.11.0) (2022-11-16)
-
-### Features
-
-* **analytics:** add publishing churn calculation values in the report ([6c43a33](https://github.com/standardnotes/server/commit/6c43a331d09c2dcf1300742509da6a1d8ef2f5b7))
-
-## [2.10.3](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.2...@standardnotes/analytics@2.10.3) (2022-11-16)
-
-### Bug Fixes
-
-* **analytics:** exclude five year plans from mrr stats ([fe1b2a0](https://github.com/standardnotes/server/commit/fe1b2a0e0744417e592f3f61f42610765b416ce6))
-
-## [2.10.2](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.1...@standardnotes/analytics@2.10.2) (2022-11-14)
-
-### Bug Fixes
-
-* **analytics:** imports from domain-core ([15dfd6d](https://github.com/standardnotes/server/commit/15dfd6dcba75a772000eeb01b78a532067b01d5b))
-
-## [2.10.1](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.10.0...@standardnotes/analytics@2.10.1) (2022-11-14)
-
-### Bug Fixes
-
-* **syncing-server:** retrieving revisions ([50f7ae3](https://github.com/standardnotes/server/commit/50f7ae338ad66d3465fa16c31e7c47c57b1e0c3c))
-
-# [2.10.0](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.9...@standardnotes/analytics@2.10.0) (2022-11-14)
-
-### Features
-
-* **analytics:** extract domain core into a separate package ([0f94e2a](https://github.com/standardnotes/server/commit/0f94e2ad0c8927733eac31f130cbe649dce765f9))
-
-## [2.9.9](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.6...@standardnotes/analytics@2.9.9) (2022-11-14)
-
-### Bug Fixes
-
-* **analytics:** bump version ([8715fe1](https://github.com/standardnotes/server/commit/8715fe182221f67f02b5f49e566366db3db581f4))
-
 ## [2.9.6](https://github.com/standardnotes/server/compare/@standardnotes/analytics@2.9.5...@standardnotes/analytics@2.9.6) (2022-11-14)
 
 **Note:** Version bump only for package @standardnotes/analytics

packages/analytics/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.12.1-alpine
+FROM node:16.15.1-alpine
 
 RUN apk add --update \
   curl \

packages/analytics/bin/report.ts

@@ -175,9 +175,6 @@ const requestReport = async (
   const churnRates: Array<{
     rate: number
     periodKey: string
-    averageCustomersCount: number
-    existingCustomersChurn: number
-    newCustomersChurn: number
   }> = []
   for (const monthPeriodKey of monthlyPeriodKeys) {
     const monthPeriod = periodKeyGenerator.convertPeriodKeyToPeriod(monthPeriodKey)
@@ -207,9 +204,6 @@ const requestReport = async (
     churnRates.push({
       periodKey: monthPeriodKey,
       rate: averageCustomersCount ? (totalChurn / averageCustomersCount) * 100 : 0,
-      averageCustomersCount,
-      existingCustomersChurn,
-      newCustomersChurn,
     })
   }
 

packages/analytics/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@standardnotes/analytics",
-  "version": "2.12.8",
+  "version": "2.9.7",
   "engines": {
-    "node": ">=18.0.0 <19.0.0"
+    "node": ">=14.0.0 <17.0.0"
   },
   "private": true,
   "description": "Analytics tools for Standard Notes projects",
@@ -25,10 +25,11 @@
     "typeorm": "typeorm-ts-node-commonjs"
   },
   "devDependencies": {
-    "@types/ioredis": "^5.0.0",
+    "@types/ioredis": "^4.28.10",
     "@types/jest": "^29.1.1",
     "@types/newrelic": "^7.0.4",
-    "@types/node": "^18.11.9",
+    "@types/node": "^18.0.0",
+    "@types/uuid": "^8.3.0",
     "@typescript-eslint/eslint-plugin": "^5.30.0",
     "eslint": "^8.14.0",
     "eslint-plugin-prettier": "^4.2.1",
@@ -37,22 +38,24 @@
     "typescript": "^4.8.4"
   },
   "dependencies": {
+    "@newrelic/native-metrics": "^9.0.0",
     "@newrelic/winston-enricher": "^4.0.0",
-    "@sentry/node": "^7.19.0",
+    "@sentry/node": "^7.3.0",
     "@standardnotes/common": "workspace:*",
-    "@standardnotes/domain-core": "workspace:*",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/time": "workspace:*",
-    "aws-sdk": "^2.1260.0",
+    "aws-sdk": "^2.1158.0",
     "dayjs": "^1.11.6",
     "dotenv": "^16.0.1",
     "inversify": "^6.0.1",
-    "ioredis": "^5.2.4",
+    "ioredis": "^5.2.3",
     "mysql2": "^2.3.3",
     "newrelic": "^9.6.0",
     "reflect-metadata": "^0.1.13",
-    "typeorm": "^0.3.10",
+    "shallow-equal-object": "^1.1.1",
+    "typeorm": "^0.3.6",
+    "uuid": "^9.0.0",
     "winston": "^3.8.1"
   }
 }

packages/analytics/src/Bootstrap/Container.ts

@@ -7,7 +7,6 @@ import {
   DomainEventMessageHandlerInterface,
   DomainEventSubscriberFactoryInterface,
 } from '@standardnotes/domain-events'
-import { MapperInterface } from '@standardnotes/domain-core'
 
 import { Env } from './Env'
 import TYPES from './Types'
@@ -48,6 +47,7 @@ import { RefundProcessedEventHandler } from '../Domain/Handler/RefundProcessedEv
 import { RevenueModificationRepositoryInterface } from '../Domain/Revenue/RevenueModificationRepositoryInterface'
 import { MySQLRevenueModificationRepository } from '../Infra/MySQL/MySQLRevenueModificationRepository'
 import { TypeORMRevenueModification } from '../Infra/TypeORM/TypeORMRevenueModification'
+import { MapInterface } from '../Domain/Map/MapInterface'
 import { RevenueModification } from '../Domain/Revenue/RevenueModification'
 import { RevenueModificationMap } from '../Domain/Map/RevenueModificationMap'
 import { SaveRevenueModification } from '../Domain/UseCase/SaveRevenueModification/SaveRevenueModification'
@@ -89,24 +89,13 @@ export class ContainerConfigLoader {
     })
     container.bind<winston.Logger>(TYPES.Logger).toConstantValue(logger)
 
-    if (env.get('SNS_TOPIC_ARN', true)) {
+    if (env.get('SNS_AWS_REGION', true)) {
-      const snsConfig: AWS.SNS.Types.ClientConfiguration = {
+      container.bind<AWS.SNS>(TYPES.SNS).toConstantValue(
-        apiVersion: 'latest',
+        new AWS.SNS({
-        region: env.get('SNS_AWS_REGION', true),
+          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_DISABLE_SSL', true) === 'true') {
-        snsConfig.sslEnabled = false
-      }
-      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<AWS.SNS>(TYPES.SNS).toConstantValue(new AWS.SNS(snsConfig))
     }
 
     if (env.get('SQS_QUEUE_URL', true)) {
@@ -183,7 +172,7 @@ export class ContainerConfigLoader {
 
     // Maps
     container
-      .bind<MapperInterface<RevenueModification, TypeORMRevenueModification>>(TYPES.RevenueModificationMap)
+      .bind<MapInterface<RevenueModification, TypeORMRevenueModification>>(TYPES.RevenueModificationMap)
       .to(RevenueModificationMap)
 
     // Services

packages/analytics/src/Domain/Common/Email.spec.ts

@@ -9,7 +9,7 @@ describe('Email', () => {
   })
 
   it('should not create an invalid value object', () => {
-    const valueOrError = Email.create('foobar')
+    const valueOrError = Email.create('')
 
     expect(valueOrError.isFailed()).toBeTruthy()
   })

packages/analytics/src/Domain/Common/Email.ts

@@ -1,7 +1,6 @@
 import { ValueObject } from '../Core/ValueObject'
 import { Result } from '../Core/Result'
 import { EmailProps } from './EmailProps'
-import { Validator } from '../Core/Validator'
 
 export class Email extends ValueObject<EmailProps> {
   get value(): string {
@@ -13,11 +12,10 @@ export class Email extends ValueObject<EmailProps> {
   }
 
   static create(email: string): Result<Email> {
-    const emailValidation = Validator.isValidEmail(email)
+    if (!!email === false || email.length === 0) {
-    if (emailValidation.isFailed()) {
+      return Result.fail<Email>('Email cannot be empty')
-      return Result.fail<Email>(emailValidation.getError())
+    } else {
+      return Result.ok<Email>(new Email({ value: email }))
     }
-
-    return Result.ok<Email>(new Email({ value: email }))
   }
 }

packages/analytics/src/Domain/Common/Uuid.spec.ts

@@ -2,14 +2,14 @@ import { Uuid } from './Uuid'
 
 describe('Uuid', () => {
   it('should create a value object', () => {
-    const valueOrError = Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d')
+    const valueOrError = Uuid.create('1-2-3')
 
     expect(valueOrError.isFailed()).toBeFalsy()
-    expect(valueOrError.getValue().value).toEqual('84c0f8e8-544a-4c7e-9adf-26209303bc1d')
+    expect(valueOrError.getValue().value).toEqual('1-2-3')
   })
 
   it('should not create an invalid value object', () => {
-    const valueOrError = Uuid.create('1-2-3')
+    const valueOrError = Uuid.create('')
 
     expect(valueOrError.isFailed()).toBeTruthy()
   })

packages/analytics/src/Domain/Common/Uuid.ts

@@ -1,7 +1,6 @@
 import { ValueObject } from '../Core/ValueObject'
 import { Result } from '../Core/Result'
 import { UuidProps } from './UuidProps'
-import { Validator } from '../Core/Validator'
 
 export class Uuid extends ValueObject<UuidProps> {
   get value(): string {
@@ -13,9 +12,8 @@ export class Uuid extends ValueObject<UuidProps> {
   }
 
   static create(uuid: string): Result<Uuid> {
-    const validUuidOrError = Validator.isValidUuid(uuid)
+    if (!!uuid === false || uuid.length === 0) {
-    if (validUuidOrError.isFailed()) {
+      return Result.fail<Uuid>('Uuid cannot be empty')
-      return Result.fail<Uuid>(validUuidOrError.getError())
     } else {
       return Result.ok<Uuid>(new Uuid({ value: uuid }))
     }

packages/analytics/src/Domain/Entity/AnalyticsEntity.ts

@@ -18,5 +18,5 @@ export class AnalyticsEntity {
     nullable: true,
   })
   @Index('email')
-  declare username: string
+  declare userEmail: string
 }

packages/analytics/src/Domain/Event/DomainEventFactory.spec.ts

@@ -0,0 +1,140 @@
+import 'reflect-metadata'
+
+import { TimerInterface } from '@standardnotes/time'
+
+import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
+import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
+import { Period } from '../Time/Period'
+
+import { DomainEventFactory } from './DomainEventFactory'
+
+describe('DomainEventFactory', () => {
+  let timer: TimerInterface
+
+  const createFactory = () => new DomainEventFactory(timer)
+
+  beforeEach(() => {
+    timer = {} as jest.Mocked<TimerInterface>
+    timer.getTimestampInMicroseconds = jest.fn().mockReturnValue(1)
+    timer.getUTCDate = jest.fn().mockReturnValue(new Date(1))
+  })
+
+  it('should create a DAILY_ANALYTICS_REPORT_GENERATED event', () => {
+    expect(
+      createFactory().createDailyAnalyticsReportGeneratedEvent({
+        activityStatistics: [
+          {
+            name: AnalyticsActivity.Register,
+            retention: 24,
+            totalCount: 45,
+          },
+        ],
+        statisticMeasures: [
+          {
+            name: StatisticsMeasure.Income,
+            totalValue: 43,
+            average: 23,
+            increments: 5,
+            period: Period.Today,
+          },
+        ],
+        activityStatisticsOverTime: [
+          {
+            name: AnalyticsActivity.Register,
+            period: Period.Last30Days,
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+            totalCount: 123,
+          },
+        ],
+        statisticsOverTime: [
+          {
+            name: StatisticsMeasure.MRR,
+            period: Period.Last30Days,
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+          },
+        ],
+        churn: {
+          periodKeys: ['2022-10-9'],
+          values: [
+            {
+              rate: 12,
+              periodKey: '2022-10-9',
+            },
+          ],
+        },
+      }),
+    ).toEqual({
+      createdAt: expect.any(Date),
+      meta: {
+        correlation: {
+          userIdentifier: '',
+          userIdentifierType: 'uuid',
+        },
+        origin: 'analytics',
+      },
+      payload: {
+        activityStatistics: [
+          {
+            name: 'register',
+            retention: 24,
+            totalCount: 45,
+          },
+        ],
+        activityStatisticsOverTime: [
+          {
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+            name: 'register',
+            period: 9,
+            totalCount: 123,
+          },
+        ],
+        statisticsOverTime: [
+          {
+            counts: [
+              {
+                periodKey: '2022-10-9',
+                totalCount: 3,
+              },
+            ],
+            name: 'mrr',
+            period: 9,
+          },
+        ],
+        churn: {
+          periodKeys: ['2022-10-9'],
+          values: [
+            {
+              periodKey: '2022-10-9',
+              rate: 12,
+            },
+          ],
+        },
+        statisticMeasures: [
+          {
+            average: 23,
+            increments: 5,
+            name: 'income',
+            period: 0,
+            totalValue: 43,
+          },
+        ],
+      },
+      type: 'DAILY_ANALYTICS_REPORT_GENERATED',
+    })
+  })
+})

packages/analytics/src/Domain/Event/DomainEventFactory.ts

@@ -1,5 +1,3 @@
-/* istanbul ignore file */
-
 import { DomainEventService, DailyAnalyticsReportGeneratedEvent } from '@standardnotes/domain-events'
 import { TimerInterface } from '@standardnotes/time'
 import { inject, injectable } from 'inversify'
@@ -45,9 +43,6 @@ export class DomainEventFactory implements DomainEventFactoryInterface {
       values: Array<{
         rate: number
         periodKey: string
-        averageCustomersCount: number
-        existingCustomersChurn: number
-        newCustomersChurn: number
       }>
     }
   }): DailyAnalyticsReportGeneratedEvent {

packages/analytics/src/Domain/Event/DomainEventFactoryInterface.ts

@@ -36,9 +36,6 @@ export interface DomainEventFactoryInterface {
       values: Array<{
         rate: number
         periodKey: string
-        averageCustomersCount: number
-        existingCustomersChurn: number
-        newCustomersChurn: number
       }>
     }
   }): DailyAnalyticsReportGeneratedEvent

packages/analytics/src/Domain/Handler/SubscriptionCancelledEventHandler.spec.ts

@@ -1,7 +1,6 @@
 import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
-import { Result } from '@standardnotes/domain-core'
 import { SubscriptionCancelledEvent } from '@standardnotes/domain-events'
 
 import { SubscriptionCancelledEventHandler } from './SubscriptionCancelledEventHandler'
@@ -10,6 +9,7 @@ import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { Period } from '../Time/Period'
+import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
 import { Logger } from 'winston'

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

@@ -1,11 +1,11 @@
 import { DomainEventHandlerInterface, SubscriptionCancelledEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
-import { Username } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Email } from '../Common/Email'
 import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
@@ -41,7 +41,7 @@ export class SubscriptionCancelledEventHandler implements DomainEventHandlerInte
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      username: Username.create(event.payload.userEmail).getValue(),
+      userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/SubscriptionExpiredEventHandler.spec.ts

@@ -2,13 +2,13 @@ import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
 import { SubscriptionExpiredEvent } from '@standardnotes/domain-events'
-import { Result } from '@standardnotes/domain-core'
 
 import { SubscriptionExpiredEventHandler } from './SubscriptionExpiredEventHandler'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { Logger } from 'winston'
 

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

@@ -1,4 +1,3 @@
-import { Username } from '@standardnotes/domain-core'
 import { DomainEventHandlerInterface, SubscriptionExpiredEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
@@ -6,6 +5,7 @@ import { Logger } from 'winston'
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Email } from '../Common/Email'
 import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
@@ -45,7 +45,7 @@ export class SubscriptionExpiredEventHandler implements DomainEventHandlerInterf
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      username: Username.create(event.payload.userEmail).getValue(),
+      userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/SubscriptionPurchasedEventHandler.spec.ts

@@ -2,7 +2,6 @@ import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
 import { SubscriptionPurchasedEvent } from '@standardnotes/domain-events'
-import { Result } from '@standardnotes/domain-core'
 
 import { SubscriptionPurchasedEventHandler } from './SubscriptionPurchasedEventHandler'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
@@ -10,6 +9,7 @@ import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { Period } from '../Time/Period'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { Logger } from 'winston'
 

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

@@ -1,4 +1,3 @@
-import { Username } from '@standardnotes/domain-core'
 import { DomainEventHandlerInterface, SubscriptionPurchasedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
@@ -6,6 +5,7 @@ import { Logger } from 'winston'
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Email } from '../Common/Email'
 import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
@@ -69,7 +69,7 @@ export class SubscriptionPurchasedEventHandler implements DomainEventHandlerInte
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      username: Username.create(event.payload.userEmail).getValue(),
+      userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/SubscriptionRefundedEventHandler.spec.ts

@@ -2,7 +2,6 @@ import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
 import { SubscriptionRefundedEvent } from '@standardnotes/domain-events'
-import { Result } from '@standardnotes/domain-core'
 
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
@@ -11,6 +10,7 @@ import { SubscriptionRefundedEventHandler } from './SubscriptionRefundedEventHan
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
 import { Period } from '../Time/Period'
+import { Result } from '../Core/Result'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
 import { Logger } from 'winston'

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

@@ -1,4 +1,3 @@
-import { Username } from '@standardnotes/domain-core'
 import { DomainEventHandlerInterface, SubscriptionRefundedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
 import { Logger } from 'winston'
@@ -6,6 +5,7 @@ import { Logger } from 'winston'
 import TYPES from '../../Bootstrap/Types'
 import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
+import { Email } from '../Common/Email'
 import { StatisticsMeasure } from '../Statistics/StatisticsMeasure'
 import { StatisticsStoreInterface } from '../Statistics/StatisticsStoreInterface'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
@@ -41,7 +41,7 @@ export class SubscriptionRefundedEventHandler implements DomainEventHandlerInter
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      username: Username.create(event.payload.userEmail).getValue(),
+      userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

packages/analytics/src/Domain/Handler/SubscriptionRenewedEventHandler.spec.ts

@@ -2,13 +2,13 @@ import 'reflect-metadata'
 
 import { SubscriptionName } from '@standardnotes/common'
 import { SubscriptionRenewedEvent } from '@standardnotes/domain-events'
-import { Result } from '@standardnotes/domain-core'
 
 import { SubscriptionRenewedEventHandler } from './SubscriptionRenewedEventHandler'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
 import { RevenueModification } from '../Revenue/RevenueModification'
+import { Result } from '../Core/Result'
 import { Logger } from 'winston'
 
 describe('SubscriptionRenewedEventHandler', () => {

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

@@ -1,6 +1,5 @@
 import { DomainEventHandlerInterface, SubscriptionRenewedEvent } from '@standardnotes/domain-events'
 import { inject, injectable } from 'inversify'
-import { Username } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
 import { GetUserAnalyticsId } from '../UseCase/GetUserAnalyticsId/GetUserAnalyticsId'
@@ -8,6 +7,7 @@ import { AnalyticsActivity } from '../Analytics/AnalyticsActivity'
 import { AnalyticsStoreInterface } from '../Analytics/AnalyticsStoreInterface'
 import { Period } from '../Time/Period'
 import { SaveRevenueModification } from '../UseCase/SaveRevenueModification/SaveRevenueModification'
+import { Email } from '../Common/Email'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
 import { Logger } from 'winston'
@@ -41,7 +41,7 @@ export class SubscriptionRenewedEventHandler implements DomainEventHandlerInterf
       payedAmount: event.payload.payAmount,
       planName: SubscriptionPlanName.create(event.payload.subscriptionName).getValue(),
       subscriptionId: event.payload.subscriptionId,
-      username: Username.create(event.payload.userEmail).getValue(),
+      userEmail: Email.create(event.payload.userEmail).getValue(),
       userUuid,
     })
 

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

@@ -18,7 +18,7 @@ export class UserRegisteredEventHandler implements DomainEventHandlerInterface {
   async handle(event: UserRegisteredEvent): Promise<void> {
     let analyticsEntity = new AnalyticsEntity()
     analyticsEntity.userUuid = event.payload.userUuid
-    analyticsEntity.username = event.payload.email
+    analyticsEntity.userEmail = event.payload.email
     analyticsEntity = await this.analyticsEntityRepository.save(analyticsEntity)
 
     await this.analyticsStore.markActivity([AnalyticsActivity.Register], analyticsEntity.id, [

packages/analytics/src/Domain/Map/MapInterface.ts

@@ -0,0 +1,4 @@
+export interface MapInterface<T, U> {
+  toDomain(persistence: U): T
+  toPersistence(domain: T): U
+}

packages/analytics/src/Domain/Map/RevenueModificationMap.ts

@@ -1,20 +1,22 @@
 import { injectable } from 'inversify'
-import { MapperInterface, UniqueEntityId, Username } from '@standardnotes/domain-core'
 
 import { TypeORMRevenueModification } from '../../Infra/TypeORM/TypeORMRevenueModification'
+import { UniqueEntityId } from '../Core/UniqueEntityId'
 import { MonthlyRevenue } from '../Revenue/MonthlyRevenue'
 import { RevenueModification } from '../Revenue/RevenueModification'
 import { Subscription } from '../Subscription/Subscription'
 import { User } from '../User/User'
+import { MapInterface } from './MapInterface'
+import { Email } from '../Common/Email'
 import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
 
 @injectable()
-export class RevenueModificationMap implements MapperInterface<RevenueModification, TypeORMRevenueModification> {
+export class RevenueModificationMap implements MapInterface<RevenueModification, TypeORMRevenueModification> {
   toDomain(persistence: TypeORMRevenueModification): RevenueModification {
     const userOrError = User.create(
       {
-        username: Username.create(persistence.username).getValue(),
+        email: Email.create(persistence.userEmail).getValue(),
       },
       new UniqueEntityId(persistence.userUuid),
     )
@@ -59,7 +61,7 @@ export class RevenueModificationMap implements MapperInterface<RevenueModificati
     return revenuModificationOrError.getValue()
   }
 
-  toProjection(domain: RevenueModification): TypeORMRevenueModification {
+  toPersistence(domain: RevenueModification): TypeORMRevenueModification {
     const { subscription, user } = domain.props
     const persistence = new TypeORMRevenueModification()
     persistence.uuid = domain.id.toString()
@@ -70,7 +72,7 @@ export class RevenueModificationMap implements MapperInterface<RevenueModificati
     persistence.previousMonthlyRevenue = domain.props.previousMonthlyRevenue.value
     persistence.subscriptionId = subscription.id.toValue() as number
     persistence.subscriptionPlan = subscription.props.planName.value
-    persistence.username = user.props.username.value
+    persistence.userEmail = user.props.email.value
     persistence.userUuid = user.id.toString()
     persistence.createdAt = domain.props.createdAt
 

packages/analytics/src/Domain/Revenue/MonthlyRevenue.ts

@@ -1,5 +1,5 @@
-import { Result, ValueObject } from '@standardnotes/domain-core'
+import { ValueObject } from '../Core/ValueObject'
-
+import { Result } from '../Core/Result'
 import { MonthlyRevenueProps } from './MonthlyRevenueProps'
 
 export class MonthlyRevenue extends ValueObject<MonthlyRevenueProps> {

packages/analytics/src/Domain/Revenue/RevenueModification.spec.ts

@@ -1,5 +1,4 @@
-import { Username } from '@standardnotes/domain-core'
+import { Email } from '../Common/Email'
-
 import { Subscription } from '../Subscription/Subscription'
 import { SubscriptionEventType } from '../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../Subscription/SubscriptionPlanName'
@@ -19,7 +18,7 @@ describe('RevenueModification', () => {
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
     }).getValue()
     user = User.create({
-      username: Username.create('test@test.te').getValue(),
+      email: Email.create('test@test.te').getValue(),
     }).getValue()
   })
 

packages/analytics/src/Domain/Revenue/RevenueModification.ts

@@ -1,5 +1,6 @@
-import { Aggregate, UniqueEntityId, Result } from '@standardnotes/domain-core'
+import { Aggregate } from '../Core/Aggregate'
-
+import { Result } from '../Core/Result'
+import { UniqueEntityId } from '../Core/UniqueEntityId'
 import { RevenueModificationProps } from './RevenueModificationProps'
 
 export class RevenueModification extends Aggregate<RevenueModificationProps> {

packages/analytics/src/Domain/Revenue/RevenueModificationRepositoryInterface.ts

@@ -1,9 +1,8 @@
-import { Uuid } from '@standardnotes/domain-core'
+import { Uuid } from '../Common/Uuid'
-
 import { RevenueModification } from './RevenueModification'
 
 export interface RevenueModificationRepositoryInterface {
   findLastByUserUuid(userUuid: Uuid): Promise<RevenueModification | null>
-  sumMRRDiff(dto: { billingFrequencies: number[]; planNames?: string[] }): Promise<number>
+  sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number>
   save(revenueModification: RevenueModification): Promise<RevenueModification>
 }

packages/analytics/src/Domain/Subscription/Subscription.ts

@@ -1,5 +1,6 @@
-import { Entity, Result, UniqueEntityId } from '@standardnotes/domain-core'
+import { Entity } from '../Core/Entity'
-
+import { Result } from '../Core/Result'
+import { UniqueEntityId } from '../Core/UniqueEntityId'
 import { SubscriptionProps } from './SubscriptionProps'
 
 export class Subscription extends Entity<SubscriptionProps> {

packages/analytics/src/Domain/Subscription/SubscriptionEventType.ts

@@ -1,5 +1,5 @@
-import { ValueObject, Result } from '@standardnotes/domain-core'
+import { ValueObject } from '../Core/ValueObject'
-
+import { Result } from '../Core/Result'
 import { SubscriptionEventTypeProps } from './SubscriptionEventTypeProps'
 
 export class SubscriptionEventType extends ValueObject<SubscriptionEventTypeProps> {

packages/analytics/src/Domain/Subscription/SubscriptionPlanName.ts

@@ -1,5 +1,5 @@
-import { Result, ValueObject } from '@standardnotes/domain-core'
+import { ValueObject } from '../Core/ValueObject'
-
+import { Result } from '../Core/Result'
 import { SubscriptionPlanNameProps } from './SubscriptionPlanNameProps'
 
 export class SubscriptionPlanName extends ValueObject<SubscriptionPlanNameProps> {

packages/analytics/src/Domain/UseCase/CalculateMonthlyRecurringRevenue/CalculateMonthlyRecurringRevenue.ts

@@ -1,8 +1,7 @@
 import { SubscriptionBillingFrequency, SubscriptionName } from '@standardnotes/common'
 import { inject, injectable } from 'inversify'
-import { Result } from '@standardnotes/domain-core'
-
 import TYPES from '../../../Bootstrap/Types'
+import { Result } from '../../Core/Result'
 import { MonthlyRevenue } from '../../Revenue/MonthlyRevenue'
 import { RevenueModificationRepositoryInterface } from '../../Revenue/RevenueModificationRepositoryInterface'
 import { StatisticsMeasure } from '../../Statistics/StatisticsMeasure'
@@ -20,9 +19,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
   ) {}
 
   async execute(_dto: CalculateMonthlyRecurringRevenueDTO): Promise<Result<MonthlyRevenue>> {
-    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({
+    const mrrDiff = await this.revenueModificationRepository.sumMRRDiff({})
-      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
-    })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.MRR, mrrDiff, [
       Period.Today,
@@ -31,7 +28,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const monthlyPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequencies: [SubscriptionBillingFrequency.Monthly],
+      billingFrequency: SubscriptionBillingFrequency.Monthly,
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.MonthlyPlansMRR, monthlyPlansMrrDiff, [
@@ -41,7 +38,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const annualPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequencies: [SubscriptionBillingFrequency.Annual],
+      billingFrequency: SubscriptionBillingFrequency.Annual,
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.AnnualPlansMRR, annualPlansMrrDiff, [
@@ -51,7 +48,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const fiveYearPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      billingFrequencies: [SubscriptionBillingFrequency.FiveYear],
+      billingFrequency: SubscriptionBillingFrequency.FiveYear,
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.FiveYearPlansMRR, fiveYearPlansMrrDiff, [
@@ -61,8 +58,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const proPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      planNames: [SubscriptionName.ProPlan],
+      planName: SubscriptionName.ProPlan,
-      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.ProPlansMRR, proPlansMrrDiff, [
@@ -72,8 +68,7 @@ export class CalculateMonthlyRecurringRevenue implements DomainUseCaseInterface<
     ])
 
     const plusPlansMrrDiff = await this.revenueModificationRepository.sumMRRDiff({
-      planNames: [SubscriptionName.PlusPlan],
+      planName: SubscriptionName.PlusPlan,
-      billingFrequencies: [SubscriptionBillingFrequency.Annual, SubscriptionBillingFrequency.Monthly],
     })
 
     await this.statisticsStore.setMeasure(StatisticsMeasure.PlusPlansMRR, plusPlansMrrDiff, [

packages/analytics/src/Domain/UseCase/DomainUseCaseInterface.ts

@@ -1,4 +1,4 @@
-import { Result } from '@standardnotes/domain-core'
+import { Result } from '../Core/Result'
 
 export interface DomainUseCaseInterface<T> {
   execute(...args: any[]): Promise<Result<T>>

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId.spec.ts

@@ -14,8 +14,8 @@ describe('GetUserAnalyticsId', () => {
   beforeEach(() => {
     analyticsEntity = {
       id: 123,
-      userUuid: '84c0f8e8-544a-4c7e-9adf-26209303bc1d',
+      userUuid: '1-2-3',
-      username: 'test@test.te',
+      userEmail: 'test@test.te',
     } as jest.Mocked<AnalyticsEntity>
 
     analyticsEntityRepository = {} as jest.Mocked<AnalyticsEntityRepositoryInterface>
@@ -24,11 +24,11 @@ describe('GetUserAnalyticsId', () => {
   })
 
   it('should return analytics id for a user by uuid', async () => {
-    expect((await createUseCase().execute({ userUuid: '1-2-3' })).analyticsId).toEqual(123)
+    expect(await (await createUseCase().execute({ userUuid: '1-2-3' })).analyticsId).toEqual(123)
   })
 
   it('should return analytics id for a user by email', async () => {
-    expect((await createUseCase().execute({ userEmail: 'test@test.te' })).analyticsId).toEqual(123)
+    expect(await (await createUseCase().execute({ userEmail: 'test@test.te' })).analyticsId).toEqual(123)
   })
 
   it('should throw error if user is missing analytics entity', async () => {

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsId.ts

@@ -1,7 +1,7 @@
 import { inject, injectable } from 'inversify'
-import { Username, Uuid } from '@standardnotes/domain-core'
-
 import TYPES from '../../../Bootstrap/Types'
+import { Email } from '../../Common/Email'
+import { Uuid } from '../../Common/Uuid'
 import { AnalyticsEntityRepositoryInterface } from '../../Entity/AnalyticsEntityRepositoryInterface'
 import { UseCaseInterface } from '../UseCaseInterface'
 import { GetUserAnalyticsIdDTO } from './GetUserAnalyticsIdDTO'
@@ -28,7 +28,7 @@ export class GetUserAnalyticsId implements UseCaseInterface {
     return {
       analyticsId: analyticsEntity.id,
       userUuid: Uuid.create(analyticsEntity.userUuid).getValue(),
-      username: Username.create(analyticsEntity.username).getValue(),
+      userEmail: Email.create(analyticsEntity.userEmail).getValue(),
     }
   }
 }

packages/analytics/src/Domain/UseCase/GetUserAnalyticsId/GetUserAnalyticsIdResponse.ts

@@ -1,7 +1,8 @@
-import { Username, Uuid } from '@standardnotes/domain-core'
+import { Email } from '../../Common/Email'
+import { Uuid } from '../../Common/Uuid'
 
 export type GetUserAnalyticsIdResponse = {
   analyticsId: number
-  username: Username
+  userEmail: Email
   userUuid: Uuid
 }

packages/analytics/src/Domain/UseCase/SaveRevenueModification/SaveRevenueModification.spec.ts

@@ -1,8 +1,9 @@
 import 'reflect-metadata'
 
 import { TimerInterface } from '@standardnotes/time'
-import { Result, Username, Uuid } from '@standardnotes/domain-core'
 
+import { Email } from '../../Common/Email'
+import { Uuid } from '../../Common/Uuid'
 import { MonthlyRevenue } from '../../Revenue/MonthlyRevenue'
 
 import { RevenueModification } from '../../Revenue/RevenueModification'
@@ -11,6 +12,7 @@ import { SubscriptionEventType } from '../../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../../Subscription/SubscriptionPlanName'
 import { SaveRevenueModification } from './SaveRevenueModification'
 import { User } from '../../User/User'
+import { Result } from '../../Core/Result'
 import { Subscription } from '../../Subscription/Subscription'
 
 describe('SaveRevenueModification', () => {
@@ -45,8 +47,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -63,8 +65,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -81,8 +83,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 2,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -101,8 +103,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeFalsy()
@@ -122,8 +124,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -142,8 +144,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -162,8 +164,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -182,8 +184,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()
@@ -202,8 +204,8 @@ describe('SaveRevenueModification', () => {
       payedAmount: 12.99,
       planName: SubscriptionPlanName.create('PRO_PLAN').getValue(),
       subscriptionId: 1234,
-      username: Username.create('test@test.te').getValue(),
+      userEmail: Email.create('test@test.te').getValue(),
-      userUuid: Uuid.create('84c0f8e8-544a-4c7e-9adf-26209303bc1d').getValue(),
+      userUuid: Uuid.create('1-2-3').getValue(),
     })
 
     expect(revenueOrError.isFailed()).toBeTruthy()

packages/analytics/src/Domain/UseCase/SaveRevenueModification/SaveRevenueModification.ts

@@ -1,12 +1,13 @@
 import { inject, injectable } from 'inversify'
-import { Result, UniqueEntityId } from '@standardnotes/domain-core'
 
 import TYPES from '../../../Bootstrap/Types'
+import { UniqueEntityId } from '../../Core/UniqueEntityId'
 import { MonthlyRevenue } from '../../Revenue/MonthlyRevenue'
 import { RevenueModification } from '../../Revenue/RevenueModification'
 import { RevenueModificationRepositoryInterface } from '../../Revenue/RevenueModificationRepositoryInterface'
 import { Subscription } from '../../Subscription/Subscription'
 import { User } from '../../User/User'
+import { Result } from '../../Core/Result'
 import { DomainUseCaseInterface } from '../DomainUseCaseInterface'
 import { SaveRevenueModificationDTO } from './SaveRevenueModificationDTO'
 import { TimerInterface } from '@standardnotes/time'
@@ -23,7 +24,7 @@ export class SaveRevenueModification implements DomainUseCaseInterface<RevenueMo
   async execute(dto: SaveRevenueModificationDTO): Promise<Result<RevenueModification>> {
     const userOrError = User.create(
       {
-        username: dto.username,
+        email: dto.userEmail,
       },
       new UniqueEntityId(dto.userUuid.value),
     )

packages/analytics/src/Domain/UseCase/SaveRevenueModification/SaveRevenueModificationDTO.ts

@@ -1,5 +1,5 @@
-import { Username, Uuid } from '@standardnotes/domain-core'
+import { Email } from '../../Common/Email'
-
+import { Uuid } from '../../Common/Uuid'
 import { SubscriptionEventType } from '../../Subscription/SubscriptionEventType'
 import { SubscriptionPlanName } from '../../Subscription/SubscriptionPlanName'
 
@@ -9,7 +9,7 @@ export interface SaveRevenueModificationDTO {
   planName: SubscriptionPlanName
   newSubscriber: boolean
   userUuid: Uuid
-  username: Username
+  userEmail: Email
   subscriptionId: number
   billingFrequency: number
 }

packages/analytics/src/Domain/User/User.spec.ts

@@ -1,11 +1,10 @@
-import { Username } from '@standardnotes/domain-core'
+import { Email } from '../Common/Email'
-
 import { User } from './User'
 
 describe('User', () => {
   it('should create an entity', () => {
     const user = User.create({
-      username: Username.create('test@test.te').getValue(),
+      email: Email.create('test@test.te').getValue(),
     }).getValue()
 
     expect(user.id.toString()).toHaveLength(36)

packages/analytics/src/Domain/User/User.ts

@@ -1,5 +1,6 @@
-import { Entity, Result, UniqueEntityId } from '@standardnotes/domain-core'
+import { Entity } from '../Core/Entity'
-
+import { Result } from '../Core/Result'
+import { UniqueEntityId } from '../Core/UniqueEntityId'
 import { UserProps } from './UserProps'
 
 export class User extends Entity<UserProps> {

packages/analytics/src/Domain/User/UserProps.ts

@@ -1,5 +1,5 @@
-import { Username } from '@standardnotes/domain-core'
+import { Email } from '../Common/Email'
 
 export interface UserProps {
-  username: Username
+  email: Email
 }

packages/analytics/src/Infra/MySQL/MySQLRevenueModificationRepository.ts

@@ -1,8 +1,9 @@
 import { inject, injectable } from 'inversify'
 import { Repository } from 'typeorm'
-import { MapperInterface, Uuid } from '@standardnotes/domain-core'
 
 import TYPES from '../../Bootstrap/Types'
+import { Uuid } from '../../Domain/Common/Uuid'
+import { MapInterface } from '../../Domain/Map/MapInterface'
 import { RevenueModification } from '../../Domain/Revenue/RevenueModification'
 import { RevenueModificationRepositoryInterface } from '../../Domain/Revenue/RevenueModificationRepositoryInterface'
 import { TypeORMRevenueModification } from '../TypeORM/TypeORMRevenueModification'
@@ -13,17 +14,17 @@ export class MySQLRevenueModificationRepository implements RevenueModificationRe
     @inject(TYPES.ORMRevenueModificationRepository)
     private ormRepository: Repository<TypeORMRevenueModification>,
     @inject(TYPES.RevenueModificationMap)
-    private revenueModificationMap: MapperInterface<RevenueModification, TypeORMRevenueModification>,
+    private revenueModificationMap: MapInterface<RevenueModification, TypeORMRevenueModification>,
   ) {}
 
-  async sumMRRDiff(dto: { billingFrequencies: number[]; planNames?: string[] }): Promise<number> {
+  async sumMRRDiff(dto: { planName?: string; billingFrequency?: number }): Promise<number> {
     const query = this.ormRepository.createQueryBuilder().select('sum(new_mrr - previous_mrr)', 'mrrDiff')
 
-    if (dto.billingFrequencies.length > 0) {
+    if (dto.planName !== undefined) {
-      query.where('billing_frequency IN (:...billingFrequencies)', { billingFrequencies: dto.billingFrequencies })
+      query.where('subscription_plan = :planName', { planName: dto.planName })
     }
-    if (dto.planNames && dto.planNames.length > 0) {
+    if (dto.billingFrequency !== undefined) {
-      query.andWhere('subscription_plan IN (:...planNames)', { planNames: dto.planNames })
+      query.where('billing_frequency = :billingFrequency', { billingFrequency: dto.billingFrequency })
     }
 
     const result = await query.getRawOne()
@@ -51,7 +52,7 @@ export class MySQLRevenueModificationRepository implements RevenueModificationRe
   }
 
   async save(revenueModification: RevenueModification): Promise<RevenueModification> {
-    let persistence = this.revenueModificationMap.toProjection(revenueModification)
+    let persistence = this.revenueModificationMap.toPersistence(revenueModification)
 
     persistence = await this.ormRepository.save(persistence)
 

packages/analytics/src/Infra/TypeORM/TypeORMRevenueModification.ts

@@ -18,7 +18,7 @@ export class TypeORMRevenueModification {
     length: 255,
   })
   @Index('email')
-  declare username: string
+  declare userEmail: string
 
   @Column({
     name: 'user_uuid',

packages/api-gateway/.env.sample

@@ -10,7 +10,6 @@ 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
-REVISIONS_SERVER_URL=http://revisions:3000
 
 HTTP_CALL_TIMEOUT=60000
 

packages/api-gateway/CHANGELOG.md

@@ -3,88 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.39.12](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.11...@standardnotes/api-gateway@1.39.12) (2022-12-08)
+## [1.38.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.1...@standardnotes/api-gateway@1.38.2) (2022-11-14)
 
 **Note:** Version bump only for package @standardnotes/api-gateway
 
-## [1.39.11](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.10...@standardnotes/api-gateway@1.39.11) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.10](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.9...@standardnotes/api-gateway@1.39.10) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.8...@standardnotes/api-gateway@1.39.9) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.7...@standardnotes/api-gateway@1.39.8) (2022-12-06)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.6...@standardnotes/api-gateway@1.39.7) (2022-12-05)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.5...@standardnotes/api-gateway@1.39.6) (2022-11-30)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.4...@standardnotes/api-gateway@1.39.5) (2022-11-28)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.3...@standardnotes/api-gateway@1.39.4) (2022-11-25)
-
-### Bug Fixes
-
-* **api-gateway:** make revisions and workspace server urls optional ([8907879](https://github.com/standardnotes/api-gateway/commit/8907879a194d2d8328fbd3ca8ec9d0b608c2da50))
-
-## [1.39.3](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.2...@standardnotes/api-gateway@1.39.3) (2022-11-25)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.2](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.1...@standardnotes/api-gateway@1.39.2) (2022-11-24)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.39.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.39.0...@standardnotes/api-gateway@1.39.1) (2022-11-23)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-# [1.39.0](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.9...@standardnotes/api-gateway@1.39.0) (2022-11-22)
-
-### Features
-
-* **api-gateway:** add v2 revisions controller ([92ba759](https://github.com/standardnotes/api-gateway/commit/92ba759b1c3719e773f989707ddd6d7a9ec57d1c))
-
-## [1.38.9](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.8...@standardnotes/api-gateway@1.38.9) (2022-11-22)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.38.8](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.7...@standardnotes/api-gateway@1.38.8) (2022-11-21)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.38.7](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.6...@standardnotes/api-gateway@1.38.7) (2022-11-18)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.38.6](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.5...@standardnotes/api-gateway@1.38.6) (2022-11-16)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.38.5](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.4...@standardnotes/api-gateway@1.38.5) (2022-11-14)
-
-**Note:** Version bump only for package @standardnotes/api-gateway
-
-## [1.38.4](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.1...@standardnotes/api-gateway@1.38.4) (2022-11-14)
-
-### Bug Fixes
-
-* **api-gateway:** bump version ([6f5e9b7](https://github.com/standardnotes/api-gateway/commit/6f5e9b7b5a83a9e8894f1dff5cfc91228d90b7b4))
-
 ## [1.38.1](https://github.com/standardnotes/api-gateway/compare/@standardnotes/api-gateway@1.38.0...@standardnotes/api-gateway@1.38.1) (2022-11-14)
 
 **Note:** Version bump only for package @standardnotes/api-gateway

packages/api-gateway/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.12.1-alpine
+FROM node:16.15.1-alpine
 
 RUN apk add --update \
   curl \

packages/api-gateway/bin/server.ts

@@ -24,7 +24,6 @@ import '../src/Controller/v1/InvitesController'
 
 import '../src/Controller/v2/PaymentsControllerV2'
 import '../src/Controller/v2/ActionsControllerV2'
-import '../src/Controller/v2/RevisionsControllerV2'
 
 import helmet from 'helmet'
 import * as cors from 'cors'

packages/api-gateway/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@standardnotes/api-gateway",
-  "version": "1.39.12",
+  "version": "1.38.2",
   "engines": {
-    "node": ">=18.0.0 <19.0.0"
+    "node": ">=16.0.0 <17.0.0"
   },
   "private": true,
   "description": "API Gateway For Standard Notes Services",
@@ -20,22 +20,23 @@
     "upgrade:snjs": "yarn ncu -u '@standardnotes/*'"
   },
   "dependencies": {
+    "@newrelic/native-metrics": "^9.0.0",
     "@newrelic/winston-enricher": "^4.0.0",
-    "@sentry/node": "^7.19.0",
+    "@sentry/node": "^7.3.0",
     "@standardnotes/common": "workspace:^",
     "@standardnotes/domain-events": "workspace:*",
     "@standardnotes/domain-events-infra": "workspace:*",
     "@standardnotes/security": "workspace:*",
     "@standardnotes/time": "workspace:*",
-    "aws-sdk": "^2.1260.0",
+    "aws-sdk": "^2.1160.0",
     "axios": "^1.1.3",
     "cors": "2.8.5",
     "dotenv": "^16.0.1",
-    "express": "^4.18.2",
+    "express": "^4.18.1",
     "helmet": "^6.0.0",
     "inversify": "^6.0.1",
     "inversify-express-utils": "^6.4.3",
-    "ioredis": "^5.2.4",
+    "ioredis": "^5.2.0",
     "jsonwebtoken": "8.5.1",
     "newrelic": "^9.6.0",
     "prettyjson": "^1.2.5",
@@ -44,8 +45,8 @@
   },
   "devDependencies": {
     "@types/cors": "^2.8.9",
-    "@types/express": "^4.17.14",
+    "@types/express": "^4.17.11",
-    "@types/ioredis": "^5.0.0",
+    "@types/ioredis": "^4.28.10",
     "@types/jest": "^29.1.1",
     "@types/jsonwebtoken": "^8.5.0",
     "@types/newrelic": "^7.0.4",

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

@@ -54,11 +54,10 @@ export class ContainerConfigLoader {
     // env vars
     container.bind(TYPES.SYNCING_SERVER_JS_URL).toConstantValue(env.get('SYNCING_SERVER_JS_URL'))
     container.bind(TYPES.AUTH_SERVER_URL).toConstantValue(env.get('AUTH_SERVER_URL'))
-    container.bind(TYPES.REVISIONS_SERVER_URL).toConstantValue(env.get('REVISIONS_SERVER_URL', true))
     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.WORKSPACE_SERVER_URL).toConstantValue(env.get('WORKSPACE_SERVER_URL'))
     container.bind(TYPES.WEB_SOCKET_SERVER_URL).toConstantValue(env.get('WEB_SOCKET_SERVER_URL', true))
     container
       .bind(TYPES.HTTP_CALL_TIMEOUT)

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

@@ -7,7 +7,6 @@ const TYPES = {
   AUTH_SERVER_URL: Symbol.for('AUTH_SERVER_URL'),
   PAYMENTS_SERVER_URL: Symbol.for('PAYMENTS_SERVER_URL'),
   FILES_SERVER_URL: Symbol.for('FILES_SERVER_URL'),
-  REVISIONS_SERVER_URL: Symbol.for('REVISIONS_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'),

packages/api-gateway/src/Controller/v2/RevisionsControllerV2.ts

@@ -1,17 +0,0 @@
-import { Request, Response } from 'express'
-import { inject } from 'inversify'
-import { BaseHttpController, controller, httpGet } from 'inversify-express-utils'
-import TYPES from '../../Bootstrap/Types'
-import { HttpServiceInterface } from '../../Service/Http/HttpServiceInterface'
-
-@controller('/v2/items/:item_id/revisions', TYPES.AuthMiddleware)
-export class RevisionsControllerV2 extends BaseHttpController {
-  constructor(@inject(TYPES.HTTPService) private httpService: HttpServiceInterface) {
-    super()
-  }
-
-  @httpGet('/')
-  async getRevisions(request: Request, response: Response): Promise<void> {
-    await this.httpService.callRevisionsServer(request, response, `items/${request.params.item_id}/revisions`)
-  }
-}

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

@@ -18,7 +18,6 @@ export class HttpService implements HttpServiceInterface {
     @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.HTTP_CALL_TIMEOUT) private httpCallTimeout: number,
     @inject(TYPES.CrossServiceTokenCache) private crossServiceTokenCache: CrossServiceTokenCacheInterface,
     @inject(TYPES.Logger) private logger: Logger,
@@ -33,20 +32,6 @@ export class HttpService implements HttpServiceInterface {
     await this.callServer(this.syncingServerJsUrl, request, response, endpoint, payload)
   }
 
-  async callRevisionsServer(
-    request: Request,
-    response: Response,
-    endpoint: string,
-    payload?: Record<string, unknown> | string,
-  ): Promise<void> {
-    if (!this.revisionsServerUrl) {
-      response.status(400).send({ message: 'Revisions Server not configured' })
-
-      return
-    }
-    await this.callServer(this.revisionsServerUrl, request, response, endpoint, payload)
-  }
-
   async callLegacySyncingServer(
     request: Request,
     response: Response,
@@ -71,12 +56,6 @@ export class HttpService implements HttpServiceInterface {
     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)
   }
 

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

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

packages/auth/CHANGELOG.md

@@ -3,150 +3,10 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [1.64.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.1...@standardnotes/auth-server@1.64.2) (2022-12-08)
+## [1.59.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.7...@standardnotes/auth-server@1.59.8) (2022-11-14)
 
 **Note:** Version bump only for package @standardnotes/auth-server
 
-## [1.64.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.64.0...@standardnotes/auth-server@1.64.1) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-# [1.64.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.2...@standardnotes/auth-server@1.64.0) (2022-12-07)
-
-### Features
-
-* **auth:** replace user signed in events with email requested ([e48cca6](https://github.com/standardnotes/server/commit/e48cca6b45b02876f2d82b726c1d2f124d90b587))
-
-## [1.63.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.1...@standardnotes/auth-server@1.63.2) (2022-12-07)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.63.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.63.0...@standardnotes/auth-server@1.63.1) (2022-12-07)
-
-### Bug Fixes
-
-* **auth:** remove not needed event from factory ([2542cf6](https://github.com/standardnotes/server/commit/2542cf6f9a40c3a5eb4e11ead3cbbc25afefae48))
-
-# [1.63.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.62.1...@standardnotes/auth-server@1.63.0) (2022-12-07)
-
-### Features
-
-* **domain-core:** rename email subscription rejection level to email level ([c87561f](https://github.com/standardnotes/server/commit/c87561fca782883b84f58b4f0b9f85ecc279ca50))
-
-## [1.62.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.62.0...@standardnotes/auth-server@1.62.1) (2022-12-06)
-
-### Bug Fixes
-
-* **auth:** remove redundant specs and fix stream query ([fb81d2b](https://github.com/standardnotes/server/commit/fb81d2b9260cf7bee3e3e6911d5a6e8eb1d650e3))
-
-# [1.62.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.61.0...@standardnotes/auth-server@1.62.0) (2022-12-06)
-
-### Features
-
-* **auth:** add procedure for email subscriptions sync ([7848dc0](https://github.com/standardnotes/server/commit/7848dc06d4f4fe8c380ed45c32e23ac0e62014fa))
-
-# [1.61.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.17...@standardnotes/auth-server@1.61.0) (2022-12-06)
-
-### Features
-
-* **auth:** add publishing mute emails setting changed event ([6928988](https://github.com/standardnotes/server/commit/6928988f7855c939f2365e35cb6cb0ff18e5c37a))
-
-## [1.60.17](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.16...@standardnotes/auth-server@1.60.17) (2022-12-06)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.16](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.15...@standardnotes/auth-server@1.60.16) (2022-12-05)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.15](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.14...@standardnotes/auth-server@1.60.15) (2022-11-30)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.14](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.13...@standardnotes/auth-server@1.60.14) (2022-11-28)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.13](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.12...@standardnotes/auth-server@1.60.13) (2022-11-25)
-
-### Bug Fixes
-
-* **auth:** bring back streaming all users in an email campaign send out ([8407c3b](https://github.com/standardnotes/server/commit/8407c3b64910c87591a97b856f5b0c0aebc98e51))
-
-## [1.60.12](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.11...@standardnotes/auth-server@1.60.12) (2022-11-25)
-
-### Bug Fixes
-
-* **auth:** tmp test email campaign black friday 2022 reminder on team only ([25a6796](https://github.com/standardnotes/server/commit/25a6796e636bc30de99001bd16a2a1084b608b6a))
-
-## [1.60.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.10...@standardnotes/auth-server@1.60.11) (2022-11-25)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.9...@standardnotes/auth-server@1.60.10) (2022-11-24)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.9](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.8...@standardnotes/auth-server@1.60.9) (2022-11-23)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.8](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.7...@standardnotes/auth-server@1.60.8) (2022-11-23)
-
-### Bug Fixes
-
-* binding of sns and sqs with additional config ([74bc791](https://github.com/standardnotes/server/commit/74bc79116bc50d9a5af1a558db1b7108dcda6d0e))
-
-## [1.60.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.6...@standardnotes/auth-server@1.60.7) (2022-11-22)
-
-### Bug Fixes
-
-* **auth:** remove temporary email campaign check for team member ([5f2be44](https://github.com/standardnotes/server/commit/5f2be44b853e83abb6c4e758efd477e899381e07))
-
-## [1.60.6](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.5...@standardnotes/auth-server@1.60.6) (2022-11-22)
-
-### Bug Fixes
-
-* sns binding ([3686a26](https://github.com/standardnotes/server/commit/3686a260192468c00b52087590dd2edf76ada939))
-
-## [1.60.5](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.4...@standardnotes/auth-server@1.60.5) (2022-11-22)
-
-### Bug Fixes
-
-* **auth:** tmp send email campaign only to team ([94359f1](https://github.com/standardnotes/server/commit/94359f1299a2bb009099af163d3929c4adc7e274))
-
-## [1.60.4](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.3...@standardnotes/auth-server@1.60.4) (2022-11-22)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.3](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.2...@standardnotes/auth-server@1.60.3) (2022-11-21)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.2](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.1...@standardnotes/auth-server@1.60.2) (2022-11-18)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.60.1](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.60.0...@standardnotes/auth-server@1.60.1) (2022-11-16)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-# [1.60.0](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.11...@standardnotes/auth-server@1.60.0) (2022-11-14)
-
-### Features
-
-* **auth:** add content size recalculation procedure trigger ([590ec66](https://github.com/standardnotes/server/commit/590ec6643db57adf3e202c6ccab4bac36aae8b59))
-
-## [1.59.11](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.10...@standardnotes/auth-server@1.59.11) (2022-11-14)
-
-**Note:** Version bump only for package @standardnotes/auth-server
-
-## [1.59.10](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.7...@standardnotes/auth-server@1.59.10) (2022-11-14)
-
-### Bug Fixes
-
-* versioning issue ([7ca377f](https://github.com/standardnotes/server/commit/7ca377f1b889379e6a43a66c0134bf266763516d))
-
 ## [1.59.7](https://github.com/standardnotes/server/compare/@standardnotes/auth-server@1.59.6...@standardnotes/auth-server@1.59.7) (2022-11-14)
 
 **Note:** Version bump only for package @standardnotes/auth-server

packages/auth/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:18.12.1-alpine
+FROM node:16.15.1-alpine
 
 RUN apk add --update \
   curl \

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/bin/email.ts

@@ -0,0 +1,136 @@
+import 'reflect-metadata'
+
+import 'newrelic'
+
+import { Stream } from 'stream'
+
+import { Logger } from 'winston'
+import * as dayjs from 'dayjs'
+import * as utc from 'dayjs/plugin/utc'
+
+import { UserRepositoryInterface } from '../src/Domain/User/UserRepositoryInterface'
+import { ContainerConfigLoader } from '../src/Bootstrap/Container'
+import TYPES from '../src/Bootstrap/Types'
+import { Env } from '../src/Bootstrap/Env'
+import { SettingServiceInterface } from '../src/Domain/Setting/SettingServiceInterface'
+import { DomainEventFactoryInterface } from '../src/Domain/Event/DomainEventFactoryInterface'
+import { UserSubscriptionRepositoryInterface } from '../src/Domain/Subscription/UserSubscriptionRepositoryInterface'
+import { DomainEventPublisherInterface } from '@standardnotes/domain-events'
+import { MuteMarketingEmailsOption, SettingName } from '@standardnotes/settings'
+import { EmailMessageIdentifier } from '@standardnotes/common'
+import { TimerInterface } from '@standardnotes/time'
+
+const inputArgs = process.argv.slice(2)
+const emailMessageIdentifier = inputArgs[0]
+
+const sendEmailCampaign = async (
+  userRepository: UserRepositoryInterface,
+  settingService: SettingServiceInterface,
+  userSubscriptionRepository: UserSubscriptionRepositoryInterface,
+  timer: TimerInterface,
+  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 {
+              const emailsMutedSetting = await settingService.findSettingWithDecryptedValue({
+                userUuid: rawUserData.user_uuid,
+                settingName: SettingName.MuteMarketingEmails,
+              })
+
+              if (emailsMutedSetting === null || emailsMutedSetting.value === MuteMarketingEmailsOption.Muted) {
+                callback()
+
+                return
+              }
+
+              let activeSubscription = false
+              let subscriptionPlanName = null
+
+              const userSubscription = await userSubscriptionRepository.findOneByUserUuid(rawUserData.user_uuid)
+              if (userSubscription !== null) {
+                activeSubscription =
+                  !userSubscription.cancelled && userSubscription.endsAt > timer.getTimestampInMicroseconds()
+                subscriptionPlanName = userSubscription.planName
+              }
+
+              await domainEventPublisher.publish(
+                domainEventFactory.createEmailMessageRequestedEvent({
+                  userEmail: rawUserData.user_email,
+                  messageIdentifier: emailMessageIdentifier as EmailMessageIdentifier,
+                  context: {
+                    activeSubscription,
+                    subscriptionPlanName,
+                    muteEmailsSettingUuid: emailsMutedSetting.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 email campaign for email ${emailMessageIdentifier} ...`)
+
+  if (!emailMessageIdentifier) {
+    logger.error('No email message identifier passed as argument. Skipped sending.')
+
+    process.exit(1)
+  }
+
+  const userRepository: UserRepositoryInterface = container.get(TYPES.UserRepository)
+  const settingService: SettingServiceInterface = container.get(TYPES.SettingService)
+  const userSubscriptionRepository: UserSubscriptionRepositoryInterface = container.get(
+    TYPES.UserSubscriptionRepository,
+  )
+  const timer: TimerInterface = container.get(TYPES.Timer)
+  const domainEventFactory: DomainEventFactoryInterface = container.get(TYPES.DomainEventFactory)
+  const domainEventPublisher: DomainEventPublisherInterface = container.get(TYPES.DomainEventPublisher)
+
+  Promise.resolve(
+    sendEmailCampaign(
+      userRepository,
+      settingService,
+      userSubscriptionRepository,
+      timer,
+      domainEventFactory,
+      domainEventPublisher,
+      logger,
+    ),
+  )
+    .then(() => {
+      logger.info(`${emailMessageIdentifier} email campaign complete.`)
+
+      process.exit(0)
+    })
+    .catch((error) => {
+      logger.error(`Could not finish ${emailMessageIdentifier} email campaign: ${error.message}`)
+
+      process.exit(1)
+    })
+})

packages/auth/docker/entrypoint.sh

@@ -5,58 +5,59 @@ COMMAND=$1 && shift 1
 
 case "$COMMAND" in
   'start-local' )
-    echo "[Docker] Starting Web..."
+    echo "Starting Web..."
     yarn workspace @standardnotes/auth-server start:local
     ;;
 
   'start-web' )
-    echo "[Docker] Starting Web..."
+    echo "Starting Web..."
     yarn workspace @standardnotes/auth-server start
     ;;
 
   'start-worker' )
-    echo "[Docker] Starting Worker..."
+    echo "Starting Worker..."
     yarn workspace @standardnotes/auth-server worker
     ;;
 
   'email-daily-backup' )
-    echo "[Docker] Starting Email Daily Backup..."
+    echo "Starting Email Daily Backup..."
     yarn workspace @standardnotes/auth-server daily-backup:email
     ;;
 
   'email-weekly-backup' )
-    echo "[Docker] Starting Email Weekly Backup..."
+    echo "Starting Email Weekly Backup..."
     yarn workspace @standardnotes/auth-server weekly-backup:email
     ;;
 
   'email-backup' )
-    echo "[Docker] Starting Email Backup For Single User..."
+    echo "Starting Email Backup For Single User..."
     EMAIL=$1 && shift 1
     yarn workspace @standardnotes/auth-server user-email-backup $EMAIL
     ;;
 
   'dropbox-daily-backup' )
-    echo "[Docker] Starting Dropbox Daily Backup..."
+    echo "Starting Dropbox Daily Backup..."
     yarn workspace @standardnotes/auth-server daily-backup:dropbox
     ;;
 
   'google-drive-daily-backup' )
-    echo "[Docker] Starting Google Drive Daily Backup..."
+    echo "Starting Google Drive Daily Backup..."
     yarn workspace @standardnotes/auth-server daily-backup:google_drive
     ;;
 
   'one-drive-daily-backup' )
-    echo "[Docker] Starting One Drive Daily Backup..."
+    echo "Starting One Drive Daily Backup..."
     yarn workspace @standardnotes/auth-server daily-backup:one_drive
     ;;
 
-  'content-recalculation' )
+  'email-campaign' )
-    echo "[Docker] Starting Content Size Recalculation..."
+    echo "Starting Email Campaign Sending..."
-    yarn workspace @standardnotes/auth-server content-recalculation
+    MESSAGE_IDENTIFIER=$1 && shift 1
+    yarn workspace @standardnotes/auth-server email-campaign $MESSAGE_IDENTIFIER
     ;;
 
    * )
-    echo "[Docker] Unknown command"
+    echo "Unknown command"
     ;;
 esac