cleanup: remove impressions worker (#3989)

heyxyz · Nov 13, 2023 · db7f499 · db7f499 · vercel · Nov 13, 2023
2 parents 5b2d20e + 12a5a1f
commit db7f499
Show file tree

Hide file tree

Showing 19 changed files with 14 additions and 156 deletions.
diff --git a/apps/web/src/lib/leafwatch.ts b/apps/web/src/lib/leafwatch.ts
@@ -29,7 +29,7 @@ export const Leafwatch = {
     worker.onmessage = function (event: MessageEvent) {
       const response = event.data;
       const xhr = new XMLHttpRequest();
-      xhr.open('POST', `${LEAFWATCH_WORKER_URL}/ingest`);
+      xhr.open('POST', `${LEAFWATCH_WORKER_URL}/events`);
       xhr.setRequestHeader('Content-Type', 'application/json');
       xhr.send(JSON.stringify(response));
     };

diff --git a/apps/web/src/service-workers/index.ts b/apps/web/src/service-workers/index.ts
@@ -1,6 +1,6 @@
 declare let self: ServiceWorkerGlobalScope;
 
-const impressionsEndpoint = 'https://impressions.hey.xyz/ingest';
+const impressionsEndpoint = 'https://leafwatch.hey.xyz/impressions';
 const publicationsVisibilityInterval = 5000;
 let viewerId: string | null = null;
 let visiblePublicationsSet = new Set();

diff --git a/docs/ports.md b/docs/ports.md
@@ -19,7 +19,6 @@ The following ports are exposed by the repository
 | 8092 | NFT worker                 | http://localhost:8092 | https://nft.hey.xyz            |
 | 8093 | Staff Picks worker         | http://localhost:8093 | https://staff-picks.hey.xyz    |
 | 8094 | Live worker                | http://localhost:8094 | https://live.hey.xyz           |
-| 8095 | Impressions worker         | http://localhost:8095 | https://impressions.hey.xyz    |
-| 8096 | Sitemap worker             | http://localhost:8096 | https://sitemap.hey.xyz        |
-| 8097 | Features worker            | http://localhost:8097 | https://features.hey.xyz       |
-| 8098 | Pro worker                 | http://localhost:8098 | https://pro.hey.xyz            |
+| 8095 | Sitemap worker             | http://localhost:8095 | https://sitemap.hey.xyz        |
+| 8096 | Features worker            | http://localhost:8096 | https://features.hey.xyz       |
+| 8097 | Pro worker                 | http://localhost:8097 | https://pro.hey.xyz            |
diff --git a/packages/data/constants.ts b/packages/data/constants.ts
@@ -97,10 +97,10 @@ export const LIVE_WORKER_URL = IS_PRODUCTION
   : 'http://localhost:8094';
 export const FEATURES_WORKER_URL = IS_PRODUCTION
   ? 'https://features.hey.xyz'
-  : 'http://localhost:8097';
+  : 'http://localhost:8096';
 export const PRO_WORKER_URL = IS_PRODUCTION
   ? 'https://pro.hey.xyz'
-  : 'http://localhost:8098';
+  : 'http://localhost:8097';
 
 // Tokens / Keys
 export const OPENSEA_KEY = '8b95f9e6d52b42fe8c19ddea847c0f5d';

diff --git a/packages/workers/features/package.json b/packages/workers/features/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
-    "dev": "wrangler dev --port 8097",
+    "dev": "wrangler dev --port 8096",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --fix --ext .ts",
     "prettier": "prettier --check \"**/*.{js,ts,tsx,md}\"  --cache",

diff --git a/packages/workers/impressions/.dev.vars.example b/packages/workers/impressions/.dev.vars.example
diff --git a/packages/workers/impressions/.eslintrc.js b/packages/workers/impressions/.eslintrc.js
diff --git a/packages/workers/impressions/README.md b/packages/workers/impressions/README.md
diff --git a/packages/workers/impressions/package.json b/packages/workers/impressions/package.json
diff --git a/packages/workers/impressions/src/helpers/buildRequest.ts b/packages/workers/impressions/src/helpers/buildRequest.ts
diff --git a/packages/workers/impressions/src/index.ts b/packages/workers/impressions/src/index.ts
diff --git a/packages/workers/impressions/src/types.ts b/packages/workers/impressions/src/types.ts
diff --git a/packages/workers/impressions/tsconfig.json b/packages/workers/impressions/tsconfig.json
diff --git a/packages/workers/impressions/wrangler.toml b/packages/workers/impressions/wrangler.toml
diff --git a/.../workers/leafwatch/src/handlers/ingest.ts → .../workers/leafwatch/src/handlers/events.ts b/.../workers/leafwatch/src/handlers/ingest.ts → .../workers/leafwatch/src/handlers/events.ts
diff --git a/...orkers/impressions/src/handlers/ingest.ts → ...ers/leafwatch/src/handlers/impressions.ts b/...orkers/impressions/src/handlers/ingest.ts → ...ers/leafwatch/src/handlers/impressions.ts
diff --git a/packages/workers/leafwatch/src/index.ts b/packages/workers/leafwatch/src/index.ts
@@ -2,7 +2,8 @@ import { Errors } from '@hey/data/errors';
 import response from '@hey/lib/response';
 import { createCors, error, Router, status } from 'itty-router';
 
-import ingest from './handlers/ingest';
+import events from './handlers/events';
+import impressions from './handlers/impressions';
 import buildRequest from './helpers/buildRequest';
 import type { Env, WorkerRequest } from './types';
 
@@ -22,7 +23,8 @@ router
       version: request.env.RELEASE ?? 'unknown'
     })
   )
-  .post('/ingest', ingest)
+  .post('/events', events)
+  .post('/impressions', impressions)
   .all('*', () => error(404));
 
 export default {

diff --git a/packages/workers/pro/package.json b/packages/workers/pro/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
-    "dev": "wrangler dev --port 8098",
+    "dev": "wrangler dev --port 8097",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --fix --ext .ts",
     "prettier": "prettier --check \"**/*.{js,ts,tsx,md}\"  --cache",

diff --git a/packages/workers/sitemap/package.json b/packages/workers/sitemap/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "license": "AGPL-3.0",
   "scripts": {
-    "dev": "wrangler dev --port 8096",
+    "dev": "wrangler dev --port 8095",
     "lint": "eslint . --ext .ts",
     "lint:fix": "eslint . --fix --ext .ts",
     "prettier": "prettier --check \"**/*.{js,ts,tsx,md}\"  --cache",