Add GitHub authentication with GITHUB_TOKEN environment variable, add TCP to Pino

Author: auguwu

Dockerfile

@@ -53,9 +53,10 @@ FROM node:19.7-alpine3.17
 RUN apk update && apk add --no-cache ca-certificates bash tini
 WORKDIR /app/noel/site
 
+COPY --from=server /build/tcp-transport.js /app/noel/site/tcp-transport.js
 COPY --from=server /build/node_modules /app/noel/site/node_modules
-COPY --from=server /build/server.js /app/noel/site/server.js
 COPY --from=server /build/transport.js /app/noel/site/transport.js
+COPY --from=server /build/server.js /app/noel/site/server.js
 COPY --from=site /build/dist /app/noel/site/dist
 
 RUN addgroup -g 1001 noel && \

package.json

@@ -1,7 +1,7 @@
 {
     "name": "@noel/site",
     "description": "🐾 Noel's personal website, blog, and documentation site made with Astro",
-    "version": "12.3.0",
+    "version": "12.3.1",
     "private": true,
     "author": "Noel <[email protected]>",
     "homepage": "https://floofy.dev",
@@ -17,7 +17,7 @@
     },
     "dependencies": {
         "@astrojs/mdx": "0.18.0",
-        "@astrojs/node": "^5.1.0",
+        "@astrojs/node": "5.1.0",
         "@astrojs/tailwind": "3.1.0",
         "@fontsource/cantarell": "4.5.10",
         "@fontsource/inter": "4.5.15",

server/server.js

@@ -48,16 +48,7 @@ const log = pino({
             { target: './transport.js' },
 
             // @ts-ignore
-            logstashTcpUrl !== undefined
-                ? {
-                      target: 'pino-socket',
-                      options: {
-                          address: logstashTcpUrl,
-                          port: 4040,
-                          mode: 'tcp'
-                      }
-                  }
-                : undefined
+            logstashTcpUrl !== undefined ? { target: './tcp-transport.js' } : undefined
         ].filter(Boolean)
     }
 });

server/tcp-transport.js

@@ -0,0 +1,42 @@
+/*
+ * 🐾 @noel/site: Noel's personal website, blog, and documentation site made with Astro
+ * Copyright (c) 2018-2023 Noel <[email protected]>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+const { formatters } = require('@augu/pino-transport');
+const psock = require('pino-socket');
+
+const logstashTcpUrl = process.env.LOGSTASH_TCP_URI;
+const logstashTcpPort = process.env.LOGSTASH_TCP_PORT || 4040;
+const json = new formatters.Json();
+
+module.exports = () =>
+    psock({
+        address: logstashTcpUrl,
+        port: logstashTcpPort,
+        mode: 'tcp',
+
+        /** @param {Buffer} data */
+        onBeforeDataWrite(data) {
+            const payload = JSON.parse(data.toString('utf-8'));
+            return Buffer.from(json.transform(payload), 'utf-8');
+        }
+    });

src/pages/index.astro

@@ -6,7 +6,15 @@ import Page from '../components/Page.astro';
 
 import '../styles/global.css';
 
-const githubRepos = await fetch('https://api.github.com/users/auguwu/repos')
+const token = import.meta.env.GITHUB_TOKEN;
+const githubRepos = await fetch('https://api.github.com/users/auguwu/repos', {
+    headers:
+        token !== undefined
+            ? {
+                  Authorization: `token ${token}`
+              }
+            : {}
+})
     .then((res) => res.json())
     .then((data: any[]) =>
         data

yarn.lock

@@ -133,7 +133,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@astrojs/node@npm:^5.1.0":
+"@astrojs/node@npm:5.1.0":
   version: 5.1.0
   resolution: "@astrojs/node@npm:5.1.0"
   dependencies:
@@ -987,7 +987,7 @@ __metadata:
   dependencies:
     "@actions/core": 1.10.0
     "@astrojs/mdx": 0.18.0
-    "@astrojs/node": ^5.1.0
+    "@astrojs/node": 5.1.0
     "@astrojs/tailwind": 3.1.0
     "@augu/eslint-config": 4.0.1
     "@augu/tsconfig": 1.1.1