prismarine-proxy 1.1.2 → 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,9 @@
 ## History
 
+### 1.1.3
+
+- Use minecraft-data's login packet if one is not in minecraft-packets
+
 ### 1.1.2
 
 - Update mcdata

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prismarine-proxy",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Provide features to build proxies using Prismarine modules",
   "main": "index.js",
   "scripts": {
@@ -24,9 +24,9 @@
   },
   "homepage": "https://github.com/PrismarineJS/prismarine-proxy#readme",
   "devDependencies": {
-    "mocha": "^9.1.3",
+    "mocha": "^10.0.0",
     "prismarine-proxy": "file:.",
-    "standard": "^16.0.1"
+    "standard": "^17.0.0"
   },
   "dependencies": {
     "debug": "^4.3.1",

package/src/instant_connect_proxy.js

@@ -7,11 +7,16 @@ const verMap = {
   '1.8.8': '1.8',
   '1.8.9': '1.8'
 }
-function getPacket (ver, name) {
-  if (!packets[ver]) 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.`)
-  const packet = packets[ver]['from-server'][name][0].json
+
+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()
@@ -30,7 +35,7 @@ class InstantConnectProxy extends EventEmitter {
     const mcData = mcDataLoader(toClient.version)
     const mcVersion = mcData.version.minecraftVersion
     const ver = verMap[mcVersion] ?? mcVersion
-    toClient.write('login', { ...getPacket(ver, 'login'), entityId: toClient.id })
+    toClient.write('login', { ...getPacket(ver, 'login', mcData), entityId: toClient.id })
 
     const toServer = createClient({
       ...this.options.clientOptions,
@@ -72,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)