I seem to have merged into the wrong branch

delete-user-data/functions/package.json

@@ -6,7 +6,7 @@
     "prepare": "npm run build",
     "build": "npm run clean && npm run compile",
     "build:watch": "npm run clean && tsc --watch",
-    "clean": "rimraf lib",
+    "clean": "node -e \"require('fs').rmSync('lib', { recursive: true, force: true })\"",
     "compile": "tsc",
     "local:emulator": "cd ../../_emulator && firebase emulators:start -P demo-test",
     "test": "cd ../../_emulator && firebase emulators:exec jest -P demo-test",
@@ -25,8 +25,6 @@
     "firebase-admin": "^12.1.0",
     "firebase-functions": "^4.9.0",
     "lodash.chunk": "^4.2.0",
-    "node-fetch": "^2.6.2",
-    "rimraf": "^2.6.3",
     "typescript": "^4.9.4",
     "@types/jest": "29.5.0",
     "jest": "29.7.0",

delete-user-data/functions/src/runCustomSearchFunction.ts

@@ -1,4 +1,3 @@
-import fetch from "node-fetch";
 import { runBatchPubSubDeletions } from "./runBatchPubSubDeletions";
 import * as logs from "./logs";
 import config from "./config";

firestore-counter/functions/package.json

@@ -5,16 +5,12 @@
   "license": "Apache-2.0",
   "description": "Auto-scalable counters for your app.",
   "dependencies": {
-    "deep-equal": "^1.0.1",
     "firebase-admin": "^12.1.0",
     "firebase-functions": "^4.9.0",
-    "uuid": "^3.3.2",
-    "rimraf": "^2.6.3",
     "typescript": "^4.9.4",
     "@types/express-serve-static-core": "4.19.8"
   },
   "devDependencies": {
-    "@types/deep-equal": "^1.0.1",
     "prettier": "1.19.1",
     "ts-node": "^7.0.1",
     "wait-for-expect": "^3.0.2",
@@ -25,7 +21,7 @@
   "scripts": {
     "prepare": "npm run build",
     "build": "npm run clean && npm run compile",
-    "clean": "rimraf lib",
+    "clean": "node -e \"require('fs').rmSync('lib', { recursive: true, force: true })\"",
     "compile": "tsc",
     "format": "prettier --write {,**/}*.{yaml,ts,md}",
     "test:local": "jest",

firestore-counter/functions/src/aggregator.ts

@@ -15,7 +15,7 @@
  */
 
 import { firestore } from "firebase-admin";
-import * as uuid from "uuid";
+import * as crypto from "crypto";
 
 export class NumericUpdate {
   protected data: { [key: string]: any } = {};
@@ -133,7 +133,7 @@ export class NumericUpdate {
 }
 
 export class Aggregator {
-  constructor(private uuidv4: () => string = uuid.v4) {}
+  constructor(private uuidv4: () => string = () => crypto.randomUUID()) {}
   /**
    * Aggregates increments from shards and partials and returns an update object suitable for
    * DocumentRef.update() call.

firestore-counter/functions/src/worker.ts

@@ -15,7 +15,8 @@
  */
 
 import { firestore } from "firebase-admin";
-import deepEqual from "deep-equal";
+import { isDeepStrictEqual } from "util";
+import * as crypto from "crypto";
 import { logger } from "firebase-functions";
 import * as events from "./events";
 import {
@@ -27,7 +28,6 @@ import {
 } from "./common";
 import { Planner } from "./planner";
 import { Aggregator, NumericUpdate } from "./aggregator";
-import * as uuid from "uuid";
 import { FieldValue } from "firebase-admin/firestore";
 
 const SHARDS_LIMIT = 100;
@@ -111,7 +111,10 @@ export class ShardedCounterWorker {
           await this.db.runTransaction(async (t) => {
             try {
               const snap = await t.get(this.metadoc.ref);
-              if (snap.exists && deepEqual(snap.data(), this.metadata)) {
+              if (
+                snap.exists &&
+                isDeepStrictEqual(snap.data(), this.metadata)
+              ) {
                 t.update(snap.ref, {
                   timestamp: FieldValue.serverTimestamp(),
                   stats: stats,
@@ -145,7 +148,7 @@ export class ShardedCounterWorker {
 
       unsubscribeMetadataListener = this.metadoc.ref.onSnapshot((snap) => {
         // if something's changed in the worker metadata since we were called, abort.
-        if (!snap.exists || !deepEqual(snap.data(), this.metadata)) {
+        if (!snap.exists || !isDeepStrictEqual(snap.data(), this.metadata)) {
           logger.log("Shutting down because metadoc changed.");
           shutdown().then(resolve).catch(reject);
         }
@@ -239,7 +242,10 @@ export class ShardedCounterWorker {
           }
 
           // Check that we still own the slice.
-          if (!metadoc.exists || !deepEqual(metadoc.data(), this.metadata)) {
+          if (
+            !metadoc.exists ||
+            !isDeepStrictEqual(metadoc.data(), this.metadata)
+          ) {
             logger.log("Metadata has changed, bailing out...");
             return [];
           }
@@ -351,7 +357,7 @@ export class ShardedCounterWorker {
               }
               t.set(
                 snap.ref,
-                update.toPartialShard(() => uuid.v4())
+                update.toPartialShard(() => crypto.randomUUID())
               );
             }
           } catch (err) {