Merge pull request #277 from vivliostyle/update-deps-in-functions

update deps and nodejs ver in /functions

functions/.node-version

@@ -1 +1 @@
-14.15.3
+18

functions/package.json

@@ -15,18 +15,18 @@
     "start": "npm run shell"
   },
   "dependencies": {
-    "@google-cloud/pubsub": "^1.7.3",
-    "@octokit/webhooks": "^7.2.0",
-    "firebase-admin": "^8.10.0",
-    "firebase-functions": "^3.6.0"
+    "@google-cloud/pubsub": "^4.0.2",
+    "@octokit/webhooks": "^12.0.3",
+    "firebase-admin": "^11.10.1",
+    "firebase-functions": "^4.4.1"
   },
   "devDependencies": {
-    "firebase-functions-test": "^0.2.1",
-    "typescript": "^3.8.3"
+    "firebase-functions-test": "^3.1.0",
+    "typescript": "^5.1.6"
   },
   "main": "lib/index.js",
   "engines": {
-    "node": "14"
+    "node": "18"
   },
   "private": true
 }

functions/src/buildPdf/index.ts

@@ -1,11 +1,10 @@
-import * as admin from 'firebase-admin';
+import {initializeApp, getApps} from 'firebase-admin/app';
+import {getFirestore} from 'firebase-admin/firestore';
 import * as functions from 'firebase-functions';
 import { PubSub } from '@google-cloud/pubsub';
 
-if (!admin.apps.length) {
-  admin.initializeApp(functions.config().firebase);
-}
-const firestore = admin.firestore();
+if (!getApps().length) initializeApp(functions.config().firebase);
+const firestore = getFirestore();
 
 const publishMessage = async(topicName:string, data:any) => {
   const pubSubClient = new PubSub();

functions/src/webhookHandler/index.ts

@@ -1,11 +1,10 @@
-import * as admin from 'firebase-admin';
+import {initializeApp, getApps} from 'firebase-admin/app';
+import {getFirestore} from 'firebase-admin/firestore';
 import * as functions from 'firebase-functions';
-import * as WebhooksApi from '@octokit/webhooks';
+import {Webhooks, createNodeMiddleware} from '@octokit/webhooks';
 
-if (!admin.apps.length) {
-  admin.initializeApp(functions.config().firebase);
-}
-const firestore = admin.firestore();
+if (!getApps().length) initializeApp(functions.config().firebase);
+const firestore = getFirestore();
 
 const getEnv = (key: string) =>
   process.env.FIREBASE_CONFIG
@@ -14,7 +13,7 @@ const getEnv = (key: string) =>
       ]
     : process.env[`GH_APP_${key}`];
 
-const webhooks = new WebhooksApi({
+const webhooks = new Webhooks({
   secret: getEnv('WEBHOOK_SECRET'),
 });
 
@@ -33,11 +32,20 @@ webhooks.on('installation', async (event) => {
   }
 });
 
-webhooks.on('error', (error) => {
+webhooks.onError((error) => {
   console.log(error.stack);
 });
 
 // Start writing Firebase Functions
 // https://firebase.google.com/docs/functions/typescript
 
-export const webhookHandler = functions.https.onRequest(webhooks.middleware);
+const middleware = createNodeMiddleware(webhooks, {path: '/'});
+
+export const webhookHandler = functions.https.onRequest(async (req, res) => {
+  if (typeof req.body === 'object') {
+    req.body = JSON.stringify(req.body);
+  }
+  if (await middleware(req, res)) return;
+  res.writeHead(404);
+  res.end();
+});