diff --git a/package.json b/package.json index 3337fbc..36c9419 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,17 @@ "name": "growtopia.js", "version": "1.6.2", "description": "A package to create a growtopia private servers.", - "main": "dist/index.js", - "types": "dist/index.d.ts", + "main": "./dist/index.js", + "types": "./dist/index.d.ts", "type": "module", + "exports": { + ".": { + "types": "./dist/index.d.ts", + "bun": "./dist/index.js", + "import": "./dist/index.js", + "require": "./dist/index.js" + } + }, "scripts": { "test": "npm run build:prebuild && npm run build:ts && node test/basic.js", "dev": "rimraf dist && npm run build && npm run build:ts && node test/basic-example/index.js", @@ -13,7 +21,7 @@ "build:prebuild": "prebuildify --napi", "build": "node-gyp-build", "build:gyp": "node-gyp configure rebuild", - "build:ts": "tsc", + "build:ts": "rimraf dist && tsc && cp -r src/types dist/types", "install": "node-gyp-build" }, "homepage": "https://github.com/JadlionHD/growtopia.js#readme", @@ -42,16 +50,16 @@ "npm": ">=7.0.0" }, "dependencies": { - "@types/node": "^20.1.5", "eventemitter3": "^5.0.1", "node-addon-api": "^8.0.0", "node-gyp": "^10.1.0", - "node-gyp-build": "^4.8.1", - "typescript": "^5.0.4" + "node-gyp-build": "^4.8.1" }, "devDependencies": { + "@types/node": "^22.7.5", "prebuildify": "^6.0.1", "rimraf": "^5.0.1", - "typedoc": "^0.26.5" + "typedoc": "^0.26.5", + "typescript": "^5.6.3" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 03d9391..a78a80c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,6 @@ importers: .: dependencies: - '@types/node': - specifier: ^20.1.5 - version: 20.16.10 eventemitter3: specifier: ^5.0.1 version: 5.0.1 @@ -23,10 +20,10 @@ importers: node-gyp-build: specifier: ^4.8.1 version: 4.8.2 - typescript: - specifier: ^5.0.4 - version: 5.6.2 devDependencies: + '@types/node': + specifier: ^22.7.5 + version: 22.7.5 prebuildify: specifier: ^6.0.1 version: 6.0.1 @@ -35,7 +32,10 @@ importers: version: 5.0.10 typedoc: specifier: ^0.26.5 - version: 0.26.7(typescript@5.6.2) + version: 0.26.7(typescript@5.6.3) + typescript: + specifier: ^5.6.3 + version: 5.6.3 packages: @@ -76,8 +76,8 @@ packages: '@types/mdast@4.0.4': resolution: {integrity: sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==} - '@types/node@20.16.10': - resolution: {integrity: sha512-vQUKgWTjEIRFCvK6CyriPH3MZYiYlNy0fKiEYHWbcoWLEgs4opurGGKlebrTLqdSMIbXImH6XExNiIyNUv3WpA==} + '@types/node@22.7.5': + resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==} '@types/unist@3.0.3': resolution: {integrity: sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==} @@ -572,8 +572,8 @@ packages: peerDependencies: typescript: 4.6.x || 4.7.x || 4.8.x || 4.9.x || 5.0.x || 5.1.x || 5.2.x || 5.3.x || 5.4.x || 5.5.x || 5.6.x - typescript@5.6.2: - resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + typescript@5.6.3: + resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} engines: {node: '>=14.17'} hasBin: true @@ -710,7 +710,7 @@ snapshots: dependencies: '@types/unist': 3.0.3 - '@types/node@20.16.10': + '@types/node@22.7.5': dependencies: undici-types: 6.19.8 @@ -1243,16 +1243,16 @@ snapshots: trim-lines@3.0.1: {} - typedoc@0.26.7(typescript@5.6.2): + typedoc@0.26.7(typescript@5.6.3): dependencies: lunr: 2.3.9 markdown-it: 14.1.0 minimatch: 9.0.5 shiki: 1.21.0 - typescript: 5.6.2 + typescript: 5.6.3 yaml: 2.5.1 - typescript@5.6.2: {} + typescript@5.6.3: {} uc.micro@2.1.0: {} diff --git a/prebuilds/win32-x64/growtopia.js.node b/prebuilds/win32-x64/growtopia.js.node index 7ce75f0..9afe0be 100644 Binary files a/prebuilds/win32-x64/growtopia.js.node and b/prebuilds/win32-x64/growtopia.js.node differ diff --git a/src/index.ts b/src/index.ts index a358367..6607720 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,4 @@ +export type * from "./types/index"; export * from "./structures/Client.js"; export * from "./structures/Peer.js"; export * from "./structures/ItemsDat.js"; @@ -6,4 +7,3 @@ export * from "./util/Utils.js"; export * from "./packets/TankPacket.js"; export * from "./packets/TextPacket.js"; export * from "./packets/Variant.js"; -export type * from "../types/index"; diff --git a/src/packets/TankPacket.ts b/src/packets/TankPacket.ts index 10ec903..35296be 100644 --- a/src/packets/TankPacket.ts +++ b/src/packets/TankPacket.ts @@ -1,4 +1,4 @@ -import type { Tank } from "../../types"; +import type { Tank } from "../types"; const TANK_HEADER_SIZE = 60; diff --git a/src/packets/Variant.ts b/src/packets/Variant.ts index 4353212..0016d44 100644 --- a/src/packets/Variant.ts +++ b/src/packets/Variant.ts @@ -1,7 +1,7 @@ import { TankPacket } from "./TankPacket.js"; // Types -import type { VariantArg, VariantArray, VariantOptions } from "../../types/packets.js"; +import type { VariantArg, VariantArray, VariantOptions } from "../types/packets.js"; import { VariantTypes } from "../util/Constants.js"; /** diff --git a/src/structures/Client.ts b/src/structures/Client.ts index a1e59bd..4141480 100644 --- a/src/structures/Client.ts +++ b/src/structures/Client.ts @@ -1,9 +1,9 @@ import EventEmitter from "eventemitter3"; -import type { Caching, ClientOptions, ClientType } from "../../types"; +import type { Caching, ClientOptions, ClientType } from "../types"; import { PacketTypes } from "../util/Constants.js"; import { parseText } from "../util/Utils.js"; import { Peer } from "./Peer.js"; -import type { ActionEvent, LoginInfo, PeerData } from "../../types"; +import type { ActionEvent, LoginInfo, PeerData } from "../types"; import { TankPacket } from "../packets/TankPacket.js"; import { dirname, join } from "path"; import { fileURLToPath } from "url"; diff --git a/src/structures/ItemsDat.ts b/src/structures/ItemsDat.ts index 18581cf..a7dad25 100644 --- a/src/structures/ItemsDat.ts +++ b/src/structures/ItemsDat.ts @@ -1,4 +1,4 @@ -import type { ExtendString, ItemDefinition, ItemsDatMeta, StringOptions } from "../../types"; +import type { ExtendString, ItemDefinition, ItemsDatMeta, StringOptions } from "../types"; export class ItemsDat { private mempos = 0; diff --git a/src/structures/Peer.ts b/src/structures/Peer.ts index c11e9c0..16ce692 100644 --- a/src/structures/Peer.ts +++ b/src/structures/Peer.ts @@ -1,4 +1,4 @@ -import type { ClientType, PeerData, Sendable } from "../../types"; +import type { ClientType, PeerData, Sendable } from "../types"; import { Variant } from "../packets/Variant.js"; import { Client } from "./Client.js"; diff --git a/types/client.d.ts b/src/types/client.d.ts similarity index 100% rename from types/client.d.ts rename to src/types/client.d.ts diff --git a/types/events.d.ts b/src/types/events.d.ts similarity index 100% rename from types/events.d.ts rename to src/types/events.d.ts diff --git a/types/index.d.ts b/src/types/index.d.ts similarity index 100% rename from types/index.d.ts rename to src/types/index.d.ts diff --git a/types/items.d.ts b/src/types/items.d.ts similarity index 98% rename from types/items.d.ts rename to src/types/items.d.ts index 145aaf9..268dc12 100644 --- a/types/items.d.ts +++ b/src/types/items.d.ts @@ -4,7 +4,7 @@ export interface StringOptions { } export interface ItemDefinition { - [key: string]: string; + [key: string]: any; id?: number; flags?: number; flagsCategory?: number; diff --git a/types/packets.d.ts b/src/types/packets.d.ts similarity index 100% rename from types/packets.d.ts rename to src/types/packets.d.ts diff --git a/types/peer.d.ts b/src/types/peer.d.ts similarity index 100% rename from types/peer.d.ts rename to src/types/peer.d.ts diff --git a/test/basic.js b/test/basic.js index aa89c78..69293b0 100644 --- a/test/basic.js +++ b/test/basic.js @@ -1,4 +1,4 @@ -import { Client, TextPacket, Peer, Tank } from "../dist/index"; +import { Client, TextPacket, Peer } from "../dist/index.js"; const client = new Client({ enet: { ip: "0.0.0.0" @@ -6,7 +6,8 @@ const client = new Client({ }); client.on("ready", () => { - console.log(`ENet server: port ${client.config.enet.port} on ${client.config.enet.ip}`); + console.log(`ENet server port ${client.config.enet?.port}`); + process.exit(0); }); client.on("error", (err) => { @@ -26,7 +27,6 @@ client.on("disconnect", (netID) => { client.on("raw", (netID, data) => { const peer = new Peer(client, netID); console.log("raw", data); - console.log(peer.ping, peer.state); }); client.listen(); diff --git a/tsconfig.json b/tsconfig.json index 5e13d7e..60f5e81 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,105 +1,25 @@ { "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": "ESNext" /* 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 TC39 stage 2 draft 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": "./", /* 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. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "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. */ - // "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. */ - // "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. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "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. */ - // "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": "dist", + "lib": ["ES2015", "ES2016", "ES2017", "ES2018", "ES2019", "ES2020", "ES2021", "ES2022"], + "module": "ES2022", + "target": "ES2022", + "noFallthroughCasesInSwitch": true, + "strict": true, + "esModuleInterop": true, + "skipLibCheck": false, + "forceConsistentCasingInFileNames": true, + "moduleResolution": "node", + "allowUnusedLabels": false, + "allowUnreachableCode": false, + "checkJs": true, + "strictPropertyInitialization": true, + "strictBindCallApply": true, + "declaration": true, + "noEmitOnError": true, + "allowSyntheticDefaultImports": true, + "resolveJsonModule": true }, "exclude": ["node_modules/**/*", "lib/**/*"], - "include": ["src/**/*", "types/**/*", "types"] + "include": ["src/**/*", "src/types/**/*"] }