mineflayer-viaproxy 0.7.0

package/README.md

@@ -0,0 +1,112 @@
+# mineflayer-viaproxy
+
+[![NPM version](https://img.shields.io/npm/v/mineflayer-viaproxy.svg)](http://npmjs.com/package/mineflayer-viaproxy)
+
+A mineflayer plugin that allows you to connect to a server through a ViaVersion proxy.
+
+Why? Because I'm tired of people asking for version updates.
+
+If you have issues, join [here](https://discord.gg/g3w4G88y) for support.
+Alternatively, [here](https://discord.gg/prismarinejs-413438066984747026) for general mineflayer support.
+
+
+### Prerequisites
+* Node.js v16 or higher
+* Java Runtime Environment (JRE) installed and accessible via command line, preferably version 17 or higher.
+
+### TODOS
+
+* [x] Support bedrock versions
+* [x] Support adding accounts to ViaProxy gracefully.
+* [x] Make fix for prismarine-registry more robust (see patches)
+* [ ] Add support for more ViaVersion options
+* [x] Add support for more ViaProxy options
+* [x] Support Python
+
+## Installation
+
+```bash
+npm install mineflayer-viaproxy
+```
+
+## Usage
+
+```js
+const { createBot } = require('mineflayer-viaproxy')
+
+// only difference is that this must be awaited now.
+const bot = await createBot({...})
+
+// if you want to pass viaProxy options, it'd be like so:
+
+const orgBotOpts = {...}
+const viaProxyOpts = {...}
+
+// same object. 
+const bot = await createBot({...orgBotOpts, ...viaProxyOpts});
+```
+
+## API
+
+### Types
+
+#### `AuthType`
+
+```ts
+export enum AuthType {
+    NONE = "NONE",
+    OPENAUTHMOD = "OPENAUTHMOD",
+    ACCOUNT = "ACCOUNT",
+}
+```
+
+| Name          | Value           | Description                                    |
+| ------------- | --------------- | ---------------------------------------------- |
+| `NONE`        | `"NONE"`        | No authentication                              |
+| `OPENAUTHMOD` | `"OPENAUTHMOD"` | OpenAuthMod authentication                     |
+| `ACCOUNT`     | `"ACCOUNT"`     | Account authentication (requires manual setup) |
+
+#### `ViaProxyOpts`
+
+```ts
+export interface ViaProxyOpts {
+    forceViaProxy?: boolean;
+    javaPath?: string;
+    localPort?: number;
+    localAuth?: AuthType;
+    viaProxyLocation?: string;
+    viaProxyWorkingDir?: string;
+    autoUpdate?: boolean;
+    viaProxyConfig?: Partial<ViaProxyConfig>;
+    viaProxyStdoutCb?: (data: any) => void;
+    viaProxyStderrCb?: (data: any) => void;
+}
+```
+
+| Name                 | Type                      | Default           | Description                                                                                                                           |
+| -------------------- | ------------------------- | ----------------- | ------------------------------------------------------------------------------------------------------------------------------------- |
+| `forceViaProxy`      | boolean                   | false             | Whether or not to force the use of ViaProxy. If set to true, it will always use ViaProxy regardless of the server version.            |
+| `javaPath`           | string                    | `"java"`          | The path to the java executable.                                                                                                      |
+| `localPort`          | number                    | *auto determined* | The port to listen on for the local server. If none is specified, it will automatically locate an open port for you on your computer. |
+| `localAuth`          | `AuthType`                | `AuthType.NONE`   | The authentication type to use for the local server.                                                                                  |
+| `viaProxyLocation`   | string                    | ""                | The location of the ViaVersion proxy jar. If none specified, it will download automatically to the CWD + `viaproxy`.                  |
+| `viaProxyWorkingDir` | string                    | ""                | The working directory for the ViaVersion proxy. If none specified, it will use the CWD + `viaproxy`.                                  |
+| `autoUpdate`         | boolean                   | true              | Whether or not to automatically update the ViaVersion proxy.                                                                          |
+| `viaProxyConfig`     | `Partial<ViaProxyConfig>` | undefined         | Configuration options for ViaProxy.                                                                                                   |
+| `viaProxyStdoutCb`   | `(data: any) => void`     | undefined         | A callback for the stdout of the ViaVersion proxy.                                                                                    |
+| `viaProxyStderrCb`   | `(data: any) => void`     | undefined         | A callback for the stderr of the ViaVersion proxy.                                                                                    |
+
+#### `ViaProxyConfig`
+
+```ts
+export interface ViaProxyConfig {
+    backendProxyUrl: string;
+    [key: string]: string | number | boolean;
+}
+```
+
+| Name              | Type    | Description                                                                         |          |                                                |
+| ----------------- | ------- | ----------------------------------------------------------------------------------- | -------- | ---------------------------------------------- |
+| `backendProxyUrl` | string  | The URL of the backend proxy to connect to. If none specified, it will not use one. |          |                                                |
+| `[key: string]`   | `string \| number \| boolean` | Additional configuration options for ViaProxy. |
+

package/dist/constants.d.ts

@@ -0,0 +1,3 @@
+export declare const BASE_VIAPROXY_URL = "https://ci.viaversion.com/view/Platforms/job/ViaProxy/lastStableBuild";
+export declare const BASE_GEYSER_URL = "https://download.geysermc.org/v2/projects/geyser";
+export declare const VIA_PROXY_CMD: (java_loc: string, loc: string, cli?: boolean) => string;

package/dist/constants.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.VIA_PROXY_CMD = exports.BASE_GEYSER_URL = exports.BASE_VIAPROXY_URL = void 0;
+exports.BASE_VIAPROXY_URL = "https://ci.viaversion.com/view/Platforms/job/ViaProxy/lastStableBuild";
+exports.BASE_GEYSER_URL = "https://download.geysermc.org/v2/projects/geyser";
+const VIA_PROXY_CMD = (java_loc, loc, cli = true) => java_loc + " -jar " + `"${loc}"` + (cli ? " cli" : "");
+exports.VIA_PROXY_CMD = VIA_PROXY_CMD;
+//# sourceMappingURL=constants.js.map

package/dist/constants.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,iBAAiB,GAAG,uEAAuE,CAAA;AAC3F,QAAA,eAAe,GAAG,kDAAkD,CAAC;AAC3E,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAE,GAAW,EAAE,GAAG,GAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,GAAG,QAAQ,GAAG,IAAI,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAApH,QAAA,aAAa,iBAAuG"}

package/dist/convNmp.d.ts

@@ -0,0 +1,6 @@
+import { BotOptions } from "mineflayer";
+import * as viaproxyTypes from "./types/config";
+export declare function generateCacheFileName(pathName: string, cacheName: string, username: string): string;
+export declare function extractCacheNames(opts: BotOptions): AsyncGenerator<string, never[] | undefined, unknown>;
+export declare function loadNmpConfig(opts: BotOptions): Promise<viaproxyTypes.ViaProxyV3Config>;
+export declare function convToV4(code: viaproxyTypes.ViaProxyV3Config): viaproxyTypes.ViaProxyV4Config;

package/dist/convNmp.js

@@ -0,0 +1,312 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __await = (this && this.__await) || function (v) { return this instanceof __await ? (this.v = v, this) : new __await(v); }
+var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var g = generator.apply(thisArg, _arguments || []), i, q = [];
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
+    function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
+    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
+    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
+    function fulfill(value) { resume("next", value); }
+    function reject(value) { resume("throw", value); }
+    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateCacheFileName = generateCacheFileName;
+exports.extractCacheNames = extractCacheNames;
+exports.loadNmpConfig = loadNmpConfig;
+exports.convToV4 = convToV4;
+const path_1 = __importDefault(require("path"));
+const promises_1 = __importDefault(require("fs/promises"));
+const utils_1 = require("./utils");
+const crypto = __importStar(require("crypto"));
+const prismarine_auth_1 = require("prismarine-auth");
+const uuid_1 = require("uuid");
+const { createHash } = require("prismarine-auth/src/common/Util");
+function generateCacheFileName(pathName, cacheName, username) {
+    return path_1.default.join(pathName, `${createHash(username)}_${cacheName}-cache.json`);
+}
+function extractCacheNames(opts) {
+    return __asyncGenerator(this, arguments, function* extractCacheNames_1() {
+        const profileFolder = (0, utils_1.validateOptions)(opts).profilesFolder;
+        if (!(yield __await(promises_1.default.stat(profileFolder).catch(() => false)))) {
+            return yield __await([]);
+        }
+        const files = yield __await(promises_1.default.readdir(profileFolder));
+        const hash = createHash(opts.username);
+        for (const file of files) {
+            if (file.startsWith(hash) && file.endsWith("-cache.json")) {
+                const cacheName = file.substring(hash.length + 1, file.length - "-cache.json".length);
+                yield yield __await(cacheName);
+            }
+        }
+    });
+}
+function loadNmpConfig(opts) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a, e_1, _b, _c;
+        var _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        const sanitizedOpts = (0, utils_1.validateOptions)(opts);
+        const flow = new prismarine_auth_1.Authflow(opts.username, sanitizedOpts.profilesFolder, {
+            authTitle: prismarine_auth_1.Titles.MinecraftNintendoSwitch, deviceType: 'Nintendo', flow: 'live'
+        });
+        const mcMgr = yield flow.getMinecraftJavaToken({ fetchCertificates: true, fetchProfile: true });
+        const caches = [];
+        try {
+            for (var _s = true, _t = __asyncValues(extractCacheNames(opts)), _u; _u = yield _t.next(), _a = _u.done, !_a; _s = true) {
+                _c = _u.value;
+                _s = false;
+                const cacheName = _c;
+                caches.push(cacheName);
+            }
+        }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        finally {
+            try {
+                if (!_s && !_a && (_b = _t.return)) yield _b.call(_t);
+            }
+            finally { if (e_1) throw e_1.error; }
+        }
+        const requiredCaches = ['live', 'mca', 'xbl'];
+        for (const req of requiredCaches) {
+            if (!caches.includes(req)) {
+                throw new Error(`Missing required cache: ${req}`);
+            }
+        }
+        const cacheMap = {};
+        for (const cacheName of caches) {
+            const cacheFile = generateCacheFileName(sanitizedOpts.profilesFolder, cacheName, sanitizedOpts.username);
+            const data = yield promises_1.default.readFile(cacheFile, 'utf-8');
+            const parsed = JSON.parse(data);
+            cacheMap[cacheName] = parsed;
+        }
+        const mca = cacheMap['mca'];
+        const mcAccessToken = mca.mca.access_token;
+        const mcExpireTimeMs = mca.mca.obtainedOn + mca.mca.expires_in * 1000;
+        const mcProfileId = mca.mca.username;
+        const mcProfileName = sanitizedOpts.username;
+        const xbl = cacheMap['xbl'];
+        const userToken = xbl.userToken.Token;
+        const userTokenExp = Date.parse(xbl.userToken.NotAfter);
+        const titleToken = xbl.titleToken.Token;
+        const titleTokenExp = Date.parse(xbl.titleToken.NotAfter);
+        const xstsToken = xbl["30f115"].XSTSToken;
+        const xstsUserHash = xbl["30f115"].userHash;
+        const deviceToken = xbl.deviceToken.Token;
+        const live = cacheMap['live'];
+        const msaAccessToken = live.token.access_token;
+        const msaRefreshToken = live.token.refresh_token;
+        const msaExpireTimeMs = live.token.obtainedOn + live.token.expires_in * 1000;
+        const keyPair = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
+        const publicKey = mcMgr.certificates.profileKeys.public.export({ type: 'spki', format: 'pem' });
+        const privateKey = mcMgr.certificates.profileKeys.private.export({ type: 'pkcs8', format: 'pem' });
+        const expiresOn = mcMgr.certificates.profileKeys.expiresOn;
+        const publicKeySignature = mcMgr.certificates.profileKeys.signatureV2.toString('base64');
+        const legacyPublicKeySignature = mcMgr.certificates.profileKeys.signature.toString('base64');
+        const combined = {
+            accountsV3: [
+                {
+                    accountType: "net.raphimc.viaproxy.saves.impl.accounts.MicrosoftAccount",
+                    javaSession: {
+                        mcProfile: {
+                            id: mcProfileId,
+                            name: mcProfileName,
+                            skinUrl: ((_d = mcMgr.profile.skins[0]) === null || _d === void 0 ? void 0 : _d.url) || "",
+                            mcToken: {
+                                accessToken: mcAccessToken,
+                                tokenType: "Bearer",
+                                expireTimeMs: mcExpireTimeMs,
+                                xblSisuAuthentication: {
+                                    userToken: {
+                                        token: userToken,
+                                        expireTimeMs: userTokenExp,
+                                        userHash: (_h = (_g = (_f = (_e = xbl.userToken.DisplayClaims) === null || _e === void 0 ? void 0 : _e.xui) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.uhs) !== null && _h !== void 0 ? _h : xstsUserHash
+                                    },
+                                    titleToken: {
+                                        token: titleToken,
+                                        expireTimeMs: titleTokenExp,
+                                        titleId: (_o = (_m = (_l = (_k = (_j = xbl.titleToken.DisplayClaims) === null || _j === void 0 ? void 0 : _j.xti) === null || _k === void 0 ? void 0 : _k.tid) === null || _l === void 0 ? void 0 : _l.toString) === null || _m === void 0 ? void 0 : _m.call(_l)) !== null && _o !== void 0 ? _o : "TODO_TITLE_ID"
+                                    },
+                                    xstsToken: {
+                                        token: xstsToken,
+                                        expireTimeMs: Date.now() + 3600000,
+                                        userHash: xstsUserHash,
+                                        displayClaims: { uhs: xstsUserHash }
+                                    },
+                                    initialXblSession: {
+                                        msaToken: {
+                                            accessToken: msaAccessToken,
+                                            refreshToken: msaRefreshToken,
+                                            expireTimeMs: msaExpireTimeMs,
+                                            msaCode: {}
+                                        },
+                                        xblDeviceToken: {
+                                            publicKey: keyPair.publicKey.export({ type: 'spki', format: 'der' }).toString('base64'),
+                                            privateKey: keyPair.privateKey.export({ type: 'pkcs8', format: 'der' }).toString('base64'),
+                                            id: (0, uuid_1.v4)(),
+                                            deviceId: (_r = (_q = (_p = xbl.deviceToken.DisplayClaims) === null || _p === void 0 ? void 0 : _p.xdi) === null || _q === void 0 ? void 0 : _q.did) !== null && _r !== void 0 ? _r : "TODO_DEVICE_ID",
+                                            expireTimeMs: Date.parse(xbl.deviceToken.NotAfter),
+                                            token: deviceToken
+                                        }
+                                    }
+                                }
+                            }
+                        },
+                        playerCertificates: {
+                            expireTimeMs: Date.parse(expiresOn),
+                            publicKey: publicKey.toString('utf-8').replace(/-----BEGIN PUBLIC KEY-----|-----END PUBLIC KEY-----|\n|\r/g, ''),
+                            privateKey: privateKey.toString('utf-8').replace(/-----BEGIN PRIVATE KEY-----|-----END PRIVATE KEY-----|\n|\r/g, ''),
+                            publicKeySignature: publicKeySignature,
+                            legacyPublicKeySignature: legacyPublicKeySignature
+                        }
+                    }
+                },
+            ],
+            ui: {},
+        };
+        return combined;
+    });
+}
+function convToV4(code) {
+    const deviceEc = crypto.generateKeyPairSync("ec", { namedCurve: "P-256" });
+    const devicePublicKeyB64 = deviceEc.publicKey.export({ type: "spki", format: "der" }).toString("base64");
+    const devicePrivateKeyB64 = deviceEc.privateKey.export({ type: "pkcs8", format: "der" }).toString("base64");
+    const accountsV4 = [];
+    for (const account of code.accountsV3) {
+        const accountV4 = Object.assign({}, account);
+        if (account.accountType === 'net.raphimc.viaproxy.saves.impl.accounts.MicrosoftAccount') {
+            const mcAcount = account;
+            const newAccount = {
+                accountType: "net.raphimc.viaproxy.saves.impl.accounts.MicrosoftAccount",
+                deviceId: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.initialXblSession.xblDeviceToken.id,
+                _saveVersion: 1,
+                msaApplicationConfig: {
+                    _saveVersion: 1,
+                    clientId: "00000000402b5328",
+                    scope: "service::user.auth.xboxlive.com::MBI_SSL",
+                    environment: "LIVE",
+                },
+                deviceType: "Win32",
+                deviceKeyPair: {
+                    algorithm: "EC",
+                    publicKey: devicePublicKeyB64,
+                    privateKey: devicePrivateKeyB64,
+                },
+                msaToken: {
+                    _saveVersion: 1,
+                    expireTimeMs: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.initialXblSession.msaToken.expireTimeMs,
+                    accessToken: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.initialXblSession.msaToken.accessToken,
+                    refreshToken: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.initialXblSession.msaToken.refreshToken,
+                },
+                xblUserToken: {
+                    _saveVersion: 1,
+                    expireTimeMs: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.userToken.expireTimeMs,
+                    token: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.userToken.token,
+                    userHash: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.userToken.userHash,
+                },
+                xblTitleToken: {
+                    _saveVersion: 1,
+                    expireTimeMs: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.titleToken.expireTimeMs,
+                    token: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.titleToken.token,
+                    titleId: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.titleToken.titleId,
+                },
+                javaXstsToken: {
+                    _saveVersion: 1,
+                    expireTimeMs: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.userToken.expireTimeMs,
+                    token: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.userToken.token,
+                    userHash: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.userToken.userHash,
+                },
+                minecraftToken: {
+                    _saveVersion: 1,
+                    expireTimeMs: mcAcount.javaSession.mcProfile.mcToken.expireTimeMs,
+                    type: mcAcount.javaSession.mcProfile.mcToken.tokenType,
+                    token: mcAcount.javaSession.mcProfile.mcToken.accessToken,
+                },
+                minecraftProfile: {
+                    _saveVersion: 1,
+                    id: mcAcount.javaSession.mcProfile.id,
+                    name: mcAcount.javaSession.mcProfile.name,
+                },
+                minecraftPlayerCertificates: {
+                    _saveVersion: 1,
+                    expireTimeMs: mcAcount.javaSession.playerCertificates.expireTimeMs,
+                    keyPair: {
+                        algorithm: "RSA",
+                        publicKey: mcAcount.javaSession.playerCertificates.publicKey,
+                        privateKey: mcAcount.javaSession.playerCertificates.privateKey,
+                    },
+                    publicKeySignature: mcAcount.javaSession.playerCertificates.publicKeySignature,
+                    legacyPublicKeySignature: mcAcount.javaSession.playerCertificates.legacyPublicKeySignature,
+                },
+                xblDeviceToken: {
+                    _saveVersion: 1,
+                    expireTimeMs: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.initialXblSession.xblDeviceToken.expireTimeMs,
+                    token: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.initialXblSession.xblDeviceToken.token,
+                    deviceId: mcAcount.javaSession.mcProfile.mcToken.xblSisuAuthentication.initialXblSession.xblDeviceToken.deviceId,
+                },
+            };
+            accountsV4.push(newAccount);
+        }
+        else {
+            accountsV4.push(accountV4);
+        }
+    }
+    return {
+        accountsV4: accountsV4,
+        ui: code.ui,
+    };
+}
+//# sourceMappingURL=convNmp.js.map

package/dist/convNmp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convNmp.js","sourceRoot":"","sources":["../src/convNmp.ts"],"names":[],"mappings":"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"}

package/dist/func.d.ts

@@ -0,0 +1,4 @@
+import { Bot, BotOptions, createBot as orgCreateBot } from "mineflayer";
+import { ViaProxyOpts } from "./types";
+import "prismarine-registry";
+export declare function createBot(options: BotOptions & ViaProxyOpts, oCreateBot?: typeof orgCreateBot): Promise<Bot>;