Merge pull request #227 from firebase/@invertase/handler-namespace

refactor(firestore-counter): use handlers

Author: tinaliang

firestore-counter/functions/lib/index.js

@@ -54,7 +54,7 @@ exports.controllerCore = functions.handler.pubsub.topic.onPublish(() => __awaite
 /**
  * Backwards compatible HTTPS function
  */
-exports.controller = functions.https.onRequest((req, res) => __awaiter(void 0, void 0, void 0, function* () {
+exports.controller = functions.handler.https.onRequest((req, res) => __awaiter(void 0, void 0, void 0, function* () {
     if (!pubsub) {
         pubsub = new pubsub_1.PubSub();
     }
@@ -71,9 +71,7 @@ exports.controller = functions.https.onRequest((req, res) => __awaiter(void 0, v
  * ControllerCore is monitoring these metadata documents to detect overload that requires
  * resharding and to detect failed workers that need poking.
  */
-exports.worker = functions.firestore
-    .document(process.env.INTERNAL_STATE_PATH + WORKERS_COLLECTION_ID + "/{workerId}")
-    .onWrite((change, context) => __awaiter(void 0, void 0, void 0, function* () {
+exports.worker = functions.handler.firestore.document.onWrite((change, context) => __awaiter(void 0, void 0, void 0, function* () {
     // stop worker if document got deleted
     if (!change.after.exists)
         return;
@@ -85,9 +83,7 @@ exports.worker = functions.firestore
  * limited to one concurrent run at the time. This helps reduce latency for workloads
  * that are below the threshold for workers.
  */
-exports.onWrite = functions.firestore
-    .document("/{collection}/{**}/_counter_shards_/{shardId}")
-    .onWrite((change, context) => __awaiter(void 0, void 0, void 0, function* () {
+exports.onWrite = functions.handler.firestore.document.onWrite((change, context) => __awaiter(void 0, void 0, void 0, function* () {
     const metadocRef = firestore.doc(process.env.INTERNAL_STATE_PATH);
     const controller = new controller_1.ShardedCounterController(metadocRef, SHARDS_COLLECTION_ID);
     yield controller.aggregateContinuously({ start: "", end: "" }, 200, 60000);

firestore-counter/functions/src/index.ts

@@ -56,15 +56,17 @@ export const controllerCore = functions.handler.pubsub.topic.onPublish(
 /**
  * Backwards compatible HTTPS function
  */
-export const controller = functions.https.onRequest(async (req, res) => {
-  if (!pubsub) {
-    pubsub = new PubSub();
+export const controller = functions.handler.https.onRequest(
+  async (req, res) => {
+    if (!pubsub) {
+      pubsub = new PubSub();
+    }
+    await pubsub
+      .topic(process.env.EXT_INSTANCE_ID)
+      .publish(Buffer.from(JSON.stringify({})));
+    res.status(200).send("Ok");
   }
-  await pubsub
-    .topic(process.env.EXT_INSTANCE_ID)
-    .publish(Buffer.from(JSON.stringify({})));
-  res.status(200).send("Ok");
-});
+);
 
 /**
  * Worker is responsible for aggregation of a defined range of shards. It is controlled
@@ -74,30 +76,28 @@ export const controller = functions.https.onRequest(async (req, res) => {
  * ControllerCore is monitoring these metadata documents to detect overload that requires
  * resharding and to detect failed workers that need poking.
  */
-export const worker = functions.firestore
-  .document(
-    process.env.INTERNAL_STATE_PATH + WORKERS_COLLECTION_ID + "/{workerId}"
-  )
-  .onWrite(async (change, context) => {
+export const worker = functions.handler.firestore.document.onWrite(
+  async (change, context) => {
     // stop worker if document got deleted
     if (!change.after.exists) return;
 
     const worker = new ShardedCounterWorker(change.after, SHARDS_COLLECTION_ID);
     await worker.run();
-  });
+  }
+);
 
 /**
  * This is an additional function that is triggered for every shard write. It is
  * limited to one concurrent run at the time. This helps reduce latency for workloads
  * that are below the threshold for workers.
  */
-export const onWrite = functions.firestore
-  .document("/{collection}/{**}/_counter_shards_/{shardId}")
-  .onWrite(async (change, context) => {
+export const onWrite = functions.handler.firestore.document.onWrite(
+  async (change, context) => {
     const metadocRef = firestore.doc(process.env.INTERNAL_STATE_PATH);
     const controller = new ShardedCounterController(
       metadocRef,
       SHARDS_COLLECTION_ID
     );
     await controller.aggregateContinuously({ start: "", end: "" }, 200, 60000);
-  });
+  }
+);