Merge pull request #4 from nemoengineering/update

Update dependencies and improve logging

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-node@v1
         with:
-          node-version: 14
+          node-version: 18
 
       - run: npm ci
 

.puppeteerrc.cjs

@@ -0,0 +1,10 @@
+
+const {join} = require('path');
+
+/**
+ * @type {import("puppeteer").Configuration}
+ */
+module.exports = {
+  // Changes the cache location for Puppeteer.
+  cacheDirectory: join(__dirname, '.cache', 'puppeteer'),
+};

Dockerfile

@@ -10,16 +10,14 @@ COPY buf.gen.yaml .
 COPY src src
 COPY proto proto
 
+ENV PUPPETEER_SKIP_DOWNLOAD=true
+
 RUN VERSION="1.4.0" && \
     curl -sSL \
     "https://github.com/bufbuild/buf/releases/download/v${VERSION}/buf-$(uname -s)-$(uname -m)" \
     -o "/usr/local/bin/buf" && \
     chmod +x "/usr/local/bin/buf"
 
-RUN VERSION="3.15.8" && \
-    curl -LO "https://github.com/protocolbuffers/protobuf/releases/download/v${VERSION}/protoc-${VERSION}-linux-x86_64.zip" && \
-    unzip "protoc-${VERSION}-linux-x86_64.zip" -d /
-
 RUN npm install && npm run build
 
 FROM node:18-slim
@@ -36,6 +34,8 @@ RUN apt-get update \
     --no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
+ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/google-chrome-stable
+
 RUN GRPC_HEALTH_PROBE_VERSION=v0.4.11 && \
     wget -qO/bin/grpc_health_probe https://github.com/grpc-ecosystem/grpc-health-probe/releases/download/${GRPC_HEALTH_PROBE_VERSION}/grpc_health_probe-linux-amd64 && \
     chmod +x /bin/grpc_health_probe
@@ -46,6 +46,7 @@ COPY --from=builder /usr/src/rendertron/package.json .
 COPY --from=builder /usr/src/rendertron/node_modules node_modules
 COPY --from=builder /usr/src/rendertron/build build
 COPY --from=builder /usr/src/rendertron/generated generated
+COPY .puppeteerrc.cjs .
 
 # Install puppeteer so it's available in the container.
 RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
@@ -56,4 +57,4 @@ RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
 # Run everything after as non-privileged user.
 USER pptruser
 
-ENTRYPOINT ["npm", "run", "start"]
+ENTRYPOINT ["node", "build/src/index.js"]

README.md

@@ -44,6 +44,7 @@ your application is rendered well before the budget expires.
 
 ### Web components
 
+[index.ts](src%2Findex.ts)
 Headless Chrome supports web components but shadow DOM is difficult to serialize effectively.
 As such, [shady DOM](https://github.com/webcomponents/shadydom) (a lightweight shim for Shadow DOM)
 is required for web components.

buf.gen.yaml

@@ -1,14 +1,19 @@
 version: v1
+managed:
+  enabled: true
 plugins:
-  - name: js
-    out: generated/nodejs
-    opt: import_style=commonjs,binary
-
-  - name: grpc
-    out: generated/nodejs
-    opt: grpc_js
-    path: grpc_tools_node_protoc_plugin
-
-  - name: ts
-    out: generated/nodejs
-    opt: grpc_js
+  - name: ts-proto
+    out: generated/_proto
+    strategy: all
+    path: ./node_modules/.bin/protoc-gen-ts_proto
+    opt:
+      - esModuleInterop=true
+      - unrecognizedEnum=false
+      - outputTypeRegistry=false
+      - outputServices=generic-definitions,outputServices=nice-grpc
+      - useExactTypes=true
+      - outputPartialMethods=false
+      - useDate=string
+      - useAbortSignal=true
+      - useSnakeTypeName=false
+      - removeEnumPrefix=true