Leahnaya/nxapi
1
0
Fork 0
mirror of https://github.com/samuelthomas2774/nxapi.git synced 2026-07-19 00:43:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/main'

Browse Source
This commit is contained in:
Samuel Elliott 2022-05-08 00:51:10 +01:00
commit 992f8900f2
No known key found for this signature in database
GPG Key ID: 8420C7CDE43DC4D6
7 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1,4 +1,4 @@
image: node:latest
image: node:17
cache:
paths:

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "nxapi",
"version": "0.2.0",
"version": "0.2.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "nxapi",
"version": "0.2.0",
"version": "0.2.1",
"dependencies": {
"body-parser": "^1.19.2",
"cli-table": "^0.3.11",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "nxapi",
"version": "0.2.0",
"version": "0.2.1",
"description": "",
"author": "Samuel Elliott",
"main": "dist/index.js",

5
src/app/main/index.ts
View File

@ -6,7 +6,7 @@ import * as persist from 'node-persist';
import fetch from 'node-fetch';
import dotenv from 'dotenv';
import dotenvExpand from 'dotenv-expand';
import { dev, getToken, initStorage, LoopResult, paths } from '../../util.js';
import { dev, dir, getToken, initStorage, LoopResult, paths } from '../../util.js';
import MenuApp from './menu.js';
import { ZncDiscordPresence } from '../../cli/nso/presence.js';
import { WebServiceIpc } from './webservices.js';
@ -16,8 +16,7 @@ import { ErrorResponse } from '../../api/util.js';
const debug = createDebug('app:main');
const __dirname = path.join(import.meta.url.substr(7), '..');
export const bundlepath = path.join(import.meta.url.substr(7), '..', '..', 'bundle');
export const bundlepath = path.resolve(dir, 'dist', 'bundle');
function createWindow() {
// Create the browser window.

4
src/cli/android-znca-api-server-frida.ts
View File

@ -6,7 +6,7 @@ import frida, { Session } from 'frida';
import express from 'express';
import bodyParser from 'body-parser';
import type { Arguments as ParentArguments } from '../cli.js';
import { ArgumentsCamelCase, Argv, getJwks, initStorage, YargsArguments } from '../util.js';
import { ArgumentsCamelCase, Argv, dir, getJwks, initStorage, YargsArguments } from '../util.js';
import { Jwt } from '../api/util.js';
import { NintendoAccountIdTokenJwtPayload } from '../api/na.js';
import { ZNCA_CLIENT_ID, ZncJwtPayload } from '../api/znc.js';
@ -271,7 +271,7 @@ async function setup(argv: ArgumentsCamelCase<Arguments>) {
'-s',
argv.device,
'push',
path.join(import.meta.url.substr(7), '..', '..', '..', 'resources', 'android-znca-api-server.sh'),
path.join(dir, 'resources', 'android-znca-api-server.sh'),
'/data/local/tmp/android-znca-api-server.sh',
], {
stdio: 'inherit',

4
src/cli/update.ts
View File

@ -3,15 +3,13 @@ import * as fs from 'fs/promises';
import fetch from 'node-fetch';
import createDebug from 'debug';
import mkdirp from 'mkdirp';
import { paths, version } from '../util.js';
import { dir, paths, version } from '../util.js';
const debug = createDebug('cli:update');
const RELEASES_URL = 'https://api.github.com/repos/samuelthomas2774/nxapi/releases';
export async function checkUpdates() {
const dir = path.resolve(import.meta.url.substr(7), '..', '..', '..');
try {
await fs.stat(path.join(dir, '.git'));

2
src/util.ts
View File

@ -19,7 +19,7 @@ const debug = createDebug('cli');
export const paths = getPaths('nxapi');
export const dir = path.resolve(import.meta.url.substr(7), '..', '..');
export const dir = path.resolve(decodeURI(import.meta.url.substr(process.platform === 'win32' ? 8 : 7)), '..', '..');
export const pkg = JSON.parse(fs.readFileSync(path.join(dir, 'package.json'), 'utf-8'));
export const version = pkg.version;
export const git = (() => {