From 48627479355d9510b8f5b835deae500755864120 Mon Sep 17 00:00:00 2001 From: Elijah R Date: Mon, 1 Jul 2024 23:49:42 -0400 Subject: [PATCH] make the workspaces actually work --- package.json | 3 +- protocol/README.md | 1 + protocol/package.json | 12 ++++ protocol/{ => src}/protocol.ts | 0 protocol/tsconfig.json | 108 +++++++++++++++++++++++++++++++++ server/README.md | 2 +- server/package.json | 5 +- server/src/client.ts | 5 +- webapp/README.md | 2 +- webapp/package.json | 2 +- yarn.lock | 56 +++++++++-------- 11 files changed, 164 insertions(+), 32 deletions(-) create mode 100644 protocol/README.md create mode 100644 protocol/package.json rename protocol/{ => src}/protocol.ts (100%) create mode 100644 protocol/tsconfig.json diff --git a/package.json b/package.json index 0d8e5f3..9463bbe 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "name": "msagent-chat", "workspaces": [ "server", - "webapp" + "webapp", + "protocol" ], "packageManager": "yarn@4.2.2" } diff --git a/protocol/README.md b/protocol/README.md new file mode 100644 index 0000000..784e223 --- /dev/null +++ b/protocol/README.md @@ -0,0 +1 @@ +# @msagent-chat/protocol diff --git a/protocol/package.json b/protocol/package.json new file mode 100644 index 0000000..eed7b8b --- /dev/null +++ b/protocol/package.json @@ -0,0 +1,12 @@ +{ + "name": "@msagent-chat/protocol", + "packageManager": "yarn@4.2.2", + "devDependencies": { + "typescript": "^5.5.3" + }, + "scripts": { + "build": "tsc" + }, + "main": "./dist/protocol.js", + "types": "./dist/protocol.d.ts" +} diff --git a/protocol/protocol.ts b/protocol/src/protocol.ts similarity index 100% rename from protocol/protocol.ts rename to protocol/src/protocol.ts diff --git a/protocol/tsconfig.json b/protocol/tsconfig.json new file mode 100644 index 0000000..aa1dbf1 --- /dev/null +++ b/protocol/tsconfig.json @@ -0,0 +1,108 @@ +{ + "compilerOptions": { + /* Visit https://aka.ms/tsconfig to read more about this file */ + + /* Projects */ + // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ + // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ + // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ + // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ + // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ + // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ + + /* Language and Environment */ + "target": "es2022", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + // "jsx": "preserve", /* Specify what JSX code is generated. */ + // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ + // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ + // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ + // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ + // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ + // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ + // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ + // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ + // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ + + /* Modules */ + "module": "es2022", /* Specify what module code is generated. */ + "rootDir": "./src", /* Specify the root folder within your source files. */ + "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ + // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ + // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ + // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ + // "types": [], /* Specify type package names to be included without being referenced in a source file. */ + // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ + // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ + // "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */ + // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ + // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ + // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ + // "resolveJsonModule": true, /* Enable importing .json files. */ + // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ + // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ + + /* JavaScript Support */ + // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ + // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ + // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ + + /* Emit */ + "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ + // "declarationMap": true, /* Create sourcemaps for d.ts files. */ + // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ + // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ + // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ + // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ + "outDir": "./dist", /* Specify an output folder for all emitted files. */ + // "removeComments": true, /* Disable emitting comments. */ + // "noEmit": true, /* Disable emitting files from a compilation. */ + // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ + // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ + // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ + // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ + // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ + // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ + // "newLine": "crlf", /* Set the newline character for emitting files. */ + // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ + // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ + // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ + // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ + // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ + + /* Interop Constraints */ + // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ + // "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */ + // "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. */ + // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ + "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ + + /* Type Checking */ + "strict": true, /* Enable all strict type-checking options. */ + // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ + // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ + // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ + // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ + // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ + // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ + // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ + // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ + // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ + // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ + // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ + // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ + // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ + // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ + // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ + // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ + // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ + // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ + + /* Completeness */ + // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ + "skipLibCheck": true /* Skip type checking all .d.ts files. */ + } +} diff --git a/server/README.md b/server/README.md index d39d2fd..87b7fd9 100644 --- a/server/README.md +++ b/server/README.md @@ -1 +1 @@ -# msagent-chat-server +# @msagent-chat/server diff --git a/server/package.json b/server/package.json index 407f7fb..80ab3c9 100644 --- a/server/package.json +++ b/server/package.json @@ -1,7 +1,8 @@ { - "name": "msagent-chat-server", + "name": "@msagent-chat/server", "scripts": { - "build": "tsc" + "build": "tsc", + "serve": "node dist/index.js" }, "packageManager": "yarn@4.2.2", "devDependencies": { diff --git a/server/src/client.ts b/server/src/client.ts index 9d5702d..9ba5f7e 100644 --- a/server/src/client.ts +++ b/server/src/client.ts @@ -1,5 +1,6 @@ import EventEmitter from "events"; import { WebSocket } from "ws"; +import { MSAgentProtocolMessage } from '@msagent-chat/protocol'; export class Client extends EventEmitter { username: string | null; @@ -21,7 +22,7 @@ export class Client extends EventEmitter { }); } - private parseMessage(msg: string) { - + private parseMessage(data: string) { + let msg: MSAgentProtocolMessage; } } \ No newline at end of file diff --git a/webapp/README.md b/webapp/README.md index e191ad1..bfeac71 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -1 +1 @@ -# msagent-chat-webapp +# @msagent-chat/webapp diff --git a/webapp/package.json b/webapp/package.json index fec4aaa..0a0c9f7 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,5 +1,5 @@ { - "name": "msagent-chat-webapp", + "name": "@msagent-chat/webapp", "scripts": { "build": "parcel build --no-source-maps --dist-dir dist --public-url '.' src/html/index.html", "serve": "parcel src/html/index.html", diff --git a/yarn.lock b/yarn.lock index 92d09d7..e72121b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -164,6 +164,38 @@ __metadata: languageName: node linkType: hard +"@msagent-chat/protocol@workspace:protocol": + version: 0.0.0-use.local + resolution: "@msagent-chat/protocol@workspace:protocol" + dependencies: + typescript: "npm:^5.5.3" + languageName: unknown + linkType: soft + +"@msagent-chat/server@workspace:server": + version: 0.0.0-use.local + resolution: "@msagent-chat/server@workspace:server" + dependencies: + "@fastify/websocket": "npm:^10.0.1" + "@types/node": "npm:^20.14.9" + "@types/ws": "npm:^8.5.10" + fastify: "npm:^4.28.1" + typescript: "npm:^5.5.3" + ws: "npm:^8.17.1" + languageName: unknown + linkType: soft + +"@msagent-chat/webapp@workspace:webapp": + version: 0.0.0-use.local + resolution: "@msagent-chat/webapp@workspace:webapp" + dependencies: + "@parcel/core": "npm:^2.12.0" + parcel: "npm:^2.12.0" + run-script-os: "npm:^1.1.6" + typescript: "npm:^5.5.3" + languageName: unknown + linkType: soft + "@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3": version: 3.0.3 resolution: "@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3" @@ -2653,30 +2685,6 @@ __metadata: languageName: node linkType: hard -"msagent-chat-server@workspace:server": - version: 0.0.0-use.local - resolution: "msagent-chat-server@workspace:server" - dependencies: - "@fastify/websocket": "npm:^10.0.1" - "@types/node": "npm:^20.14.9" - "@types/ws": "npm:^8.5.10" - fastify: "npm:^4.28.1" - typescript: "npm:^5.5.3" - ws: "npm:^8.17.1" - languageName: unknown - linkType: soft - -"msagent-chat-webapp@workspace:webapp": - version: 0.0.0-use.local - resolution: "msagent-chat-webapp@workspace:webapp" - dependencies: - "@parcel/core": "npm:^2.12.0" - parcel: "npm:^2.12.0" - run-script-os: "npm:^1.1.6" - typescript: "npm:^5.5.3" - languageName: unknown - linkType: soft - "msagent-chat@workspace:.": version: 0.0.0-use.local resolution: "msagent-chat@workspace:."