From 3cafaaf23effd19460d3901bfb6d8559ce0f213a Mon Sep 17 00:00:00 2001 From: Mincong Huang Date: Fri, 31 Jan 2025 13:28:12 +0100 Subject: [PATCH 1/4] Create github-server --- apps/{simple-app => github-server}/package.json | 4 ++-- apps/{simple-app => github-server}/src/index.js | 0 pnpm-lock.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename apps/{simple-app => github-server}/package.json (60%) rename apps/{simple-app => github-server}/src/index.js (100%) diff --git a/apps/simple-app/package.json b/apps/github-server/package.json similarity index 60% rename from apps/simple-app/package.json rename to apps/github-server/package.json index bcaa576..7793f44 100644 --- a/apps/simple-app/package.json +++ b/apps/github-server/package.json @@ -1,8 +1,8 @@ { - "name": "@dglabs/simple-app", + "name": "@dglabs/github-server", "version": "1.0.0", "private": true, - "description": "Simple app for the GitHub demo.", + "description": "Simple web server for the GitHub demo.", "main": "lib/index.js", "scripts": { "build": "mkdir -p dist && cp src/index.js dist/" diff --git a/apps/simple-app/src/index.js b/apps/github-server/src/index.js similarity index 100% rename from apps/simple-app/src/index.js rename to apps/github-server/src/index.js diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 600bb48..9014b6d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -74,7 +74,7 @@ importers: specifier: ^5.7.2 version: 5.7.2 - apps/simple-app: {} + apps/github-server: {} packages: From 707b0edc8f02a0447f23e2e2c28afbb35fe37b49 Mon Sep 17 00:00:00 2001 From: Mincong Huang Date: Fri, 31 Jan 2025 13:36:12 +0100 Subject: [PATCH 2/4] Add server.ts --- apps/github-server/package.json | 3 +++ apps/github-server/src/server.ts | 13 +++++++++++++ pnpm-lock.yaml | 6 +++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 apps/github-server/src/server.ts diff --git a/apps/github-server/package.json b/apps/github-server/package.json index 7793f44..0163e08 100644 --- a/apps/github-server/package.json +++ b/apps/github-server/package.json @@ -6,5 +6,8 @@ "main": "lib/index.js", "scripts": { "build": "mkdir -p dist && cp src/index.js dist/" + }, + "dependencies": { + "@dglabs/logger": "^0.9.2" } } diff --git a/apps/github-server/src/server.ts b/apps/github-server/src/server.ts new file mode 100644 index 0000000..d95cd53 --- /dev/null +++ b/apps/github-server/src/server.ts @@ -0,0 +1,13 @@ +import { logger } from "@dglabs/logger"; + +process.on('uncaughtException', function (err) { + console.error('Uncaught error!', err.stack); +}); + +export default function start() { + const PORT = process.env.PORT ? parseInt(process.env.PORT) : 8080; + logger.info(`Starting GitHub Server on port ${PORT}...`); +} + +logger.info(`Node version: ${process.version}`); +start(); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9014b6d..8ae976f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -74,7 +74,11 @@ importers: specifier: ^5.7.2 version: 5.7.2 - apps/github-server: {} + apps/github-server: + dependencies: + '@dglabs/logger': + specifier: ^0.9.2 + version: 0.9.2 packages: From a884f074672b1290bbe129f30f3e7209f19e0c20 Mon Sep 17 00:00:00 2001 From: Mincong Huang Date: Fri, 31 Jan 2025 13:39:48 +0100 Subject: [PATCH 3/4] Copy ts config from studio-server --- apps/github-server/package.json | 3 ++- apps/github-server/tsconfig.json | 46 ++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 apps/github-server/tsconfig.json diff --git a/apps/github-server/package.json b/apps/github-server/package.json index 0163e08..6916c8e 100644 --- a/apps/github-server/package.json +++ b/apps/github-server/package.json @@ -5,7 +5,8 @@ "description": "Simple web server for the GitHub demo.", "main": "lib/index.js", "scripts": { - "build": "mkdir -p dist && cp src/index.js dist/" + "build": "mkdir -p dist && cp src/index.js dist/", + "start": "node dist/index.js" }, "dependencies": { "@dglabs/logger": "^0.9.2" diff --git a/apps/github-server/tsconfig.json b/apps/github-server/tsconfig.json new file mode 100644 index 0000000..9375881 --- /dev/null +++ b/apps/github-server/tsconfig.json @@ -0,0 +1,46 @@ +{ + "compilerOptions": { + "jsx": "react", + "composite": true, + "rootDir": "./src", + "sourceMap": true, + "outDir": "./lib", + "forceConsistentCasingInFileNames": true, + "experimentalDecorators": true, + /* Enable experimental support for TC39 stage 2 draft decorators. */ + "allowSyntheticDefaultImports": true, + /* Allow 'import x from y' when a module doesn't have a default export. */ + "esModuleInterop": true, + /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */ + "target": "ES2020", + "useDefineForClassFields": true, + "lib": [ + "ES2020", + ], + "module": "nodenext", + "moduleResolution": "nodenext", + // "module": "CommonJS", + // "moduleResolution": "node", + "skipLibCheck": true, + /* Bundler mode */ + //"allowImportingTsExtensions": true, + "resolveJsonModule": true, + "isolatedModules": true, + /* Linting */ + "strict": true, + "noUnusedLocals": true, + "noUnusedParameters": true, + "noFallthroughCasesInSwitch": true, + "inlineSources": true, + }, + "include": [ + "src" + ], + "exclude": [ + "node_modules", + "**/*.test.ts", + "lib", + "test" + ], + "references": [] +} \ No newline at end of file From f3e5ee6282831c1bee63c2e49ee46a7a2c30875b Mon Sep 17 00:00:00 2001 From: Mincong Huang Date: Fri, 31 Jan 2025 13:54:32 +0100 Subject: [PATCH 4/4] Refactor simple-app --- apps/github-server/package.json | 12 ++++++++---- apps/github-server/src/index.js | 1 - apps/github-server/src/main.ts | 1 + apps/github-server/src/server.ts | 2 +- apps/github-server/src/setup-logger.ts | 27 ++++++++++++++++++++++++++ pnpm-lock.yaml | 4 ++++ 6 files changed, 41 insertions(+), 6 deletions(-) delete mode 100644 apps/github-server/src/index.js create mode 100644 apps/github-server/src/main.ts create mode 100644 apps/github-server/src/setup-logger.ts diff --git a/apps/github-server/package.json b/apps/github-server/package.json index 6916c8e..f3c54ef 100644 --- a/apps/github-server/package.json +++ b/apps/github-server/package.json @@ -1,14 +1,18 @@ { "name": "@dglabs/github-server", - "version": "1.0.0", + "version": "1.10.0", "private": true, + "type": "module", "description": "Simple web server for the GitHub demo.", "main": "lib/index.js", "scripts": { - "build": "mkdir -p dist && cp src/index.js dist/", - "start": "node dist/index.js" + "build": "rm -rf ./lib tsconfig.tsbuildinfo && tsc --build", + "start": "node lib/main.js" }, "dependencies": { "@dglabs/logger": "^0.9.2" + }, + "devDependencies": { + "typescript": "^5.7.2" } -} +} \ No newline at end of file diff --git a/apps/github-server/src/index.js b/apps/github-server/src/index.js deleted file mode 100644 index e9fe009..0000000 --- a/apps/github-server/src/index.js +++ /dev/null @@ -1 +0,0 @@ -console.log('Hello, world!'); diff --git a/apps/github-server/src/main.ts b/apps/github-server/src/main.ts new file mode 100644 index 0000000..0d69608 --- /dev/null +++ b/apps/github-server/src/main.ts @@ -0,0 +1 @@ +import "./server.js"; \ No newline at end of file diff --git a/apps/github-server/src/server.ts b/apps/github-server/src/server.ts index d95cd53..51fb6df 100644 --- a/apps/github-server/src/server.ts +++ b/apps/github-server/src/server.ts @@ -1,4 +1,4 @@ -import { logger } from "@dglabs/logger"; +import { logger } from "./setup-logger.js"; process.on('uncaughtException', function (err) { console.error('Uncaught error!', err.stack); diff --git a/apps/github-server/src/setup-logger.ts b/apps/github-server/src/setup-logger.ts new file mode 100644 index 0000000..f0583f3 --- /dev/null +++ b/apps/github-server/src/setup-logger.ts @@ -0,0 +1,27 @@ +import { BaseLogger, configure } from "@dglabs/logger"; +// import Env from "./env.js"; +// import { getWebContext } from "./web-context.js"; +// import datadog from "dd-trace"; + +// function mixin(obj: any) { + // const webContext = getWebContext(); + // const span = datadog.tracer.scope().active(); + // const spanContext = span ? { 'dd.trace_id': span.context().toTraceId(), 'dd.span_id' : span.context().toSpanId() } : {}; + + // return webContext ? { + // ...obj, + // 'studio': webContext.studio.logContext, + // ...(span ? spanContext : {}), + // } : obj || undefined; +// } + +const logger: BaseLogger = configure({ + level: "info", //Env.logLevel as LogLevel, + name: "github-server", + type: "staging", //Env.type, + version: "0.0.0", //Env.version, + datadog: undefined, //Env.datadog, + // cloud: "gcp", //Env.cloud.name, +}); + +export { logger }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8ae976f..399b4b6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -79,6 +79,10 @@ importers: '@dglabs/logger': specifier: ^0.9.2 version: 0.9.2 + devDependencies: + typescript: + specifier: ^5.7.2 + version: 5.7.2 packages: