skip react-native ops if dirs don't exist (#11974)

Author: alecsavvy

packages/discovery-provider/plugins/pedalboard/apps/relay/src/server.ts

@@ -1,6 +1,5 @@
 import { healthCheck } from './routes/health'
 import express from 'express'
-import { relayTransaction } from './txRelay'
 import { errorHandler } from './middleware/errorHandler'
 import {
   incomingRequestLogger,
@@ -9,8 +8,7 @@ import {
 import { validator } from './middleware/validator'
 import cors from 'cors'
 import bodyParser from 'body-parser'
-import { antiAbuseMiddleware } from './middleware/antiAbuse'
-import { rateLimiterMiddleware } from './middleware/rateLimiter'
+import { relayTransaction } from './txRelay'
 
 export const app = express()
 

packages/discovery-provider/plugins/pedalboard/apps/relay/src/txRelay.ts

@@ -0,0 +1,29 @@
+import { coreRelay } from './coreRelay'
+import { internalError } from './error'
+import {
+  TransactionReceipt,
+  TransactionRequest
+} from '@ethersproject/abstract-provider'
+import { NextFunction, Request, Response } from 'express'
+
+export type RelayedTransaction = {
+  receipt: TransactionReceipt
+  transaction: TransactionRequest
+}
+
+export const relayTransaction = async (
+  _req: Request,
+  res: Response,
+  next: NextFunction
+) => {
+  // pull info from validated request
+  const { validatedRelayRequest, logger, requestId } = res.locals.ctx
+  try {
+    const receipt = await coreRelay(logger, requestId, validatedRelayRequest)
+    logger.info({ receipt }, "sending back")
+    res.send({ receipt })
+  } catch (e) {
+    internalError(next, e)
+    return
+  }
+}

scripts/postinstall.sh

@@ -19,22 +19,24 @@ fi
 printf "${GREEN}Setting up initial package links...\n${NC}"
 {
   # First ensure react-native exists in root node_modules for patch-package
-  if [ ! -e "node_modules/react-native" ]; then
+  if [ ! -e "node_modules/react-native" ] && [ -e "./packages/mobile/node_modules/react-native" ]; then
     printf "${GREEN}Moving react-native to root node_modules...\n${NC}"
     cp -R ./packages/mobile/node_modules/react-native ./node_modules/
     rm -rf ./packages/mobile/node_modules/react-native
   fi
 
-  cd ./packages/mobile/node_modules
+  if [ -d "./packages/mobile/node_modules" ]; then
+    cd ./packages/mobile/node_modules
 
-  # Link react-native-code-push from root since it's not in mobile/node_modules
-  source_path=../../../node_modules/react-native-code-push
-  target_path=react-native-code-push
-  if [ ! -e "$target_path" ]; then
-    ln -s "$source_path" "$target_path"
-  fi
+    # Link react-native-code-push from root since it's not in mobile/node_modules
+    source_path=../../../node_modules/react-native-code-push
+    target_path=react-native-code-push
+    if [ ! -e "$target_path" ]; then
+      ln -s "$source_path" "$target_path"
+    fi
 
-  cd ../../..
+    cd ../../..
+  fi
 } > /dev/null
 
 printf "${GREEN}Applying patches...\n${NC}"
@@ -43,7 +45,7 @@ npm run patch-package > /dev/null
 printf "${GREEN}Moving react-native back to mobile...\n${NC}"
 {
   # Move react-native back to mobile/node_modules for pod install
-  if [ -e "node_modules/react-native" ]; then
+  if [ -e "node_modules/react-native" ] && [ -d "./packages/mobile/node_modules" ]; then
     rm -rf ./packages/mobile/node_modules/react-native
     mv ./node_modules/react-native ./packages/mobile/node_modules/
     # Create symlink back to root