diff --git a/SS_Test/package-lock.json b/SS_Test/package-lock.json index ada75ae3..dae3337f 100644 --- a/SS_Test/package-lock.json +++ b/SS_Test/package-lock.json @@ -9,6 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { + "@epicgames-ps/lib-pixelstreamingcommon-ue5.5": "^0.0.6", "@protobuf-ts/plugin": "^2.9.3", "ws": "^8.14.2" }, @@ -20,6 +21,14 @@ "typescript": "^5.3.2" } }, + "node_modules/@epicgames-ps/lib-pixelstreamingcommon-ue5.5": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@epicgames-ps/lib-pixelstreamingcommon-ue5.5/-/lib-pixelstreamingcommon-ue5.5-0.0.6.tgz", + "integrity": "sha512-woNjFRisrbZjb7ec6QBh4OD9G4Fo/GK2yzfD4BauRUP++VokfHeEM0ZshC2QR5lyFwaBv++gylcUHUzr6HvL+A==", + "dependencies": { + "@protobuf-ts/plugin": "^2.9.3" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", diff --git a/SS_Test/package.json b/SS_Test/package.json index 0d0254b1..b1d50228 100644 --- a/SS_Test/package.json +++ b/SS_Test/package.json @@ -1,6 +1,6 @@ { "name": "ss_test", - "version": "1.0.0", + "version": "1.0.1", "description": "", "main": "test.js", "scripts": { @@ -12,6 +12,7 @@ "author": "", "license": "ISC", "dependencies": { + "@epicgames-ps/lib-pixelstreamingcommon-ue5.5": "^0.0.6", "@protobuf-ts/plugin": "^2.9.3", "ws": "^8.14.2" }, diff --git a/SS_Test/src/index.ts b/SS_Test/src/index.ts index 415e7fb9..e8986908 100644 --- a/SS_Test/src/index.ts +++ b/SS_Test/src/index.ts @@ -1,8 +1,7 @@ import { TestContext, SignallingConnection } from './signalling_tester'; -import config from './config'; -import assert from 'assert'; -import * as Messages from './signalling_messages'; import WebSocket from 'ws'; +import { Messages } from '@epicgames-ps/lib-pixelstreamingcommon-ue5.5'; +import config from './config'; function logFunction(connection: SignallingConnection, message: string): void { console.log(`${connection.name}: ${message}`); diff --git a/SS_Test/src/message_helpers.ts b/SS_Test/src/message_helpers.ts deleted file mode 100644 index 1ca92c2e..00000000 --- a/SS_Test/src/message_helpers.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { IMessageType } from "@protobuf-ts/runtime"; -import * as Messages from './signalling_messages'; - -export interface BaseMessage { - type: string; -} - -export const messageTypeRegistry: Record> = { - 'answer': Messages.answer, - 'config': Messages.config, - 'dataChannelRequest': Messages.dataChannelRequest, - 'disconnectPlayer': Messages.disconnectPlayer, - 'endpointId': Messages.endpointId, - 'iceCandidate': Messages.iceCandidate, - 'identify': Messages.identify, - 'layerPreference': Messages.layerPreference, - 'listStreamers': Messages.listStreamers, - 'offer': Messages.offer, - 'peerDataChannelsReady': Messages.peerDataChannelsReady, - 'ping': Messages.ping, - 'playerConnected': Messages.playerConnected, - 'playerCount': Messages.playerCount, - 'playerDisconnected': Messages.playerDisconnected, - 'pong': Messages.pong, - 'stats': Messages.stats, - 'streamerDataChannels': Messages.streamerDataChannels, - 'streamerDisconnected': Messages.streamerDisconnected, - 'streamerList': Messages.streamerList, - 'subscribe': Messages.subscribe, - 'unsubscribe': Messages.unsubscribe, -} - -export function createMessage(messageType: IMessageType, params?: any) { - const message = messageType.create(); - message.type = messageType.typeName; - if (params) { - messageType.mergePartial(message, params); - } - return message; -} diff --git a/SS_Test/src/signalling_tester.ts b/SS_Test/src/signalling_tester.ts index 65d450ef..92e3f542 100644 --- a/SS_Test/src/signalling_tester.ts +++ b/SS_Test/src/signalling_tester.ts @@ -1,6 +1,5 @@ import WebSocket from 'ws'; -import { IMessageType } from "@protobuf-ts/runtime"; -import { BaseMessage, messageTypeRegistry, createMessage } from './message_helpers'; +import { IMessageType, BaseMessage, MessageRegistry, MessageHelpers } from '@epicgames-ps/lib-pixelstreamingcommon-ue5.5'; export interface ExpectedMessage { type: 'message'; @@ -222,7 +221,7 @@ export class SignallingConnection { * @param params - Extra parameters to set on the message. */ sendMessage(messageType: IMessageType, params?: any) { - const message = createMessage(messageType, params); + const message = MessageHelpers.createMessage(messageType, params); if (!this.validateProtoMessage(message)) { return; } @@ -413,7 +412,7 @@ export class SignallingConnection { return null; } - const messageType = messageTypeRegistry[msg.type]; + const messageType = MessageRegistry[msg.type]; if (!messageType) { this.addError(`Message is of an unknown type: "${messageType}". Rejected.`); return null; diff --git a/SS_Test/tsconfig.json b/SS_Test/tsconfig.json index 6256fe52..6e7696cc 100644 --- a/SS_Test/tsconfig.json +++ b/SS_Test/tsconfig.json @@ -1,109 +1,15 @@ { "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": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - "lib": ["es6"], /* 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": "commonjs", /* Specify what module code is generated. */ - "rootDir": "src", /* Specify the root folder within your source files. */ - // "moduleResolution": "node10", /* 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": "build", /* 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. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "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. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - - /* 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. */ - // "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. */ - } + "outDir": "./build", + "noImplicitAny": true, + "module": "commonjs", + "esModuleInterop": true, + "target": "es5", + "moduleResolution": "node", + "sourceMap": false, + "allowJs": true, + "declaration": false + }, + "lib": ["es2015"], + "include": ["./src/*.ts"], }