prismarine-proxy 1.1.0 → 1.1.3

package/.github/workflows/publish.yml

@@ -13,13 +13,20 @@ jobs:
     - name: Set up Node.js
       uses: actions/setup-node@master
       with:
-        node-version: 10.0.0
-    - name: Publish if version has been updated
-      uses: pascalgn/npm-publish-action@4f4bf159e299f65d21cd1cbd96fc5d53228036df
-      with: # All of theses inputs are optional
-        tag_name: "%s"
-        tag_message: "%s"
-        commit_pattern: "^Release (\\S+)"
-      env: # More info about the environment variables in the README
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Leave this as is, it's automatically generated
-        NPM_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} # You need to set this in your repo settings
+        node-version: 14.0.0
+    - id: publish
+      uses: JS-DevTools/npm-publish@v1
+      with:
+        token: ${{ secrets.NPM_AUTH_TOKEN }}
+    - name: Create Release
+      if: steps.publish.outputs.type != 'none'
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ steps.publish.outputs.version }}
+        release_name: Release ${{ steps.publish.outputs.version }}
+        body: ${{ steps.publish.outputs.version }}
+        draft: false
+        prerelease: false

package/HISTORY.md

@@ -1,5 +1,17 @@
 ## History
 
+### 1.1.3
+
+- Use minecraft-data's login packet if one is not in minecraft-packets
+
+### 1.1.2
+
+- Update mcdata
+
+### 1.1.1
+
+- Fix bug with InstantConnectProxy to make connecting possible
+
 ### 1.1.0
 
 - Make InstantConnectProxy use `minecraft-packets` to generate some packets

package/README.md

@@ -13,7 +13,7 @@ Provide features to build low and high level proxies, see https://github.com/Pri
 Example of use case :
 * client side proxies :
   * make yourself a bot : do pathfinding like a bot, auto dig things, ...
-  * share your world view with a friend using prismarine-view
+  * share your world view with a friend using prismarine-viewer
 * server side proxies :
   * act as a proxy with many vanilla client servers, with portals or commands to switch
   * change things in server behavior : forbid going to some places, change the blocks, ...
@@ -36,7 +36,7 @@ const login = ['my@email.com', 'mypassword']
 
 const proxy = new InstantConnectProxy({
   loginHandler: (client) => { // client object has a username object, so you can store usernames with their respective logins
-    return { username: login[0], password: password[1] } // the login the proxy will connect to the server with
+    return { username: login[0], password: login[1] } // the login the proxy will connect to the server with
   },
   serverOptions: { // options for the local server shown to the vanilla client
     version: '1.8.9'
@@ -58,4 +58,4 @@ proxy.on('outgoing', (data, meta, toClient, toServer) => { // packets outgoing f
 })
 ```
 
-The name of the particles can be found [here](https://minecraft-data.prismarine.js.org/) , make sure to select the version you are playing on at the top then click protocol, more info about packets can be found [here](https://wiki.vg/Protocol/) , make sure to select the version you are working with
+The name of the particles can be found [here](https://minecraft-data.prismarine.js.org/) , make sure to select the version you are playing on at the top then click protocol, more info about packets can be found [here](https://wiki.vg/Protocol) , make sure to select the version you are working with

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "prismarine-proxy",
-  "version": "1.1.0",
+  "version": "1.1.3",
   "description": "Provide features to build proxies using Prismarine modules",
   "main": "index.js",
   "scripts": {
-    "test": "jest --verbose",
+    "test": "mocha --reporter spec --exit",
     "pretest": "npm run lint",
     "lint": "standard",
     "fix": "standard --fix"
@@ -24,13 +24,13 @@
   },
   "homepage": "https://github.com/PrismarineJS/prismarine-proxy#readme",
   "devDependencies": {
-    "jest": "^27.0.4",
+    "mocha": "^10.0.0",
     "prismarine-proxy": "file:.",
-    "standard": "^16.0.1"
+    "standard": "^17.0.0"
   },
   "dependencies": {
     "debug": "^4.3.1",
-    "minecraft-data": "^2.94.0",
+    "minecraft-data": "^3.0.0",
     "minecraft-packets": "^1.5.0",
     "minecraft-protocol": "^1.13.0"
   }

package/src/instant_connect_proxy.js

@@ -3,7 +3,20 @@ const { createServer, createClient } = require('minecraft-protocol')
 const packets = require('minecraft-packets').pc
 const mcDataLoader = require('minecraft-data')
 const PLAY_STATE = 'play'
-const getPacket = (ver, name) => packets[ver]['from-server'][name][0].json
+const verMap = {
+  '1.8.8': '1.8',
+  '1.8.9': '1.8'
+}
+
+function getPacket (ver, name, mcData) {
+  let packet = packets[ver]?.['from-server']?.[name][0].json
+  if (name === 'login') {
+    packet = packet ?? mcData.loginPacket
+  }
+  if (!packet) throw new Error(`Packets for version ${ver} aren't stored. This can be fixed by dumping them adding them to the verMap if similar packets are stored.`)
+  return packet
+}
+
 class InstantConnectProxy extends EventEmitter {
   constructor (options) {
     super()
@@ -19,8 +32,10 @@ class InstantConnectProxy extends EventEmitter {
 
   onLogin (toClient) {
     // until the proxyClient logs in, lets send a login packet
-    const ver = mcDataLoader(toClient.version).version.minecraftVersion
-    toClient.write('login', { ...getPacket(ver, 'login'), entityId: toClient.id })
+    const mcData = mcDataLoader(toClient.version)
+    const mcVersion = mcData.version.minecraftVersion
+    const ver = verMap[mcVersion] ?? mcVersion
+    toClient.write('login', { ...getPacket(ver, 'login', mcData), entityId: toClient.id })
 
     const toServer = createClient({
       ...this.options.clientOptions,
@@ -33,25 +48,13 @@ class InstantConnectProxy extends EventEmitter {
     toServer.on('login', (data) => {
       if (!this.clientIsOnline(toClient)) return
       this.emit('start', toClient, toServer)
-      const dimension = data.dimension === 0 ? -1 : 0
-      toClient.write('respawn', {
-        ...getPacket(ver, 'respawn'),
-        ...{
-          dimension,
-          difficulty: data.difficulty,
-          gamemode: data.gameMode,
-          levelType: data.levelType
-        }
-      })
-      toClient.write('login', {
-        ...getPacket(ver, 'respawn'),
-        ...{
-          dimension: data.dimension,
-          difficulty: data.difficulty,
-          gamemode: data.gameMode,
-          levelType: data.levelType
-        }
-      })
+      // https://github.com/VelocityPowered/Velocity/blob/aa210b3544556c46776976cddc45deb4ace9bb68/proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java#L437
+      let dimension = data.dimension
+      if (mcData.isOlderThan('1.16')) {
+        dimension = data.dimension === 0 ? -1 : 0
+      }
+      toClient.write('respawn', { ...data, dimension })
+      toClient.write('respawn', data)
     })
 
     toClient.on('packet', (data, meta) => {
@@ -74,6 +77,7 @@ class InstantConnectProxy extends EventEmitter {
         this.emit('incoming', data, meta, toClient, toServer)
       }
     })
+
     toClient.once('end', () => {
       this.emit('end', toServer.username)
       this.endClient(toClient)

package/test/basic.test.js

@@ -1,7 +1,7 @@
-/* eslint-env jest */
+/* eslint-env mocha */
 
 describe('works', () => {
-  test('it works', () => {
+  it('it works', () => {
     console.log('done !')
   })
 })