From 5f6004bd572a9d83b613656bc332adfbd63ea072 Mon Sep 17 00:00:00 2001 From: Samuel Elliott Date: Sat, 21 May 2022 23:47:41 +0100 Subject: [PATCH] Move authentication functions app no longer imports from cli --- src/api/splatnet2.ts | 7 +++- src/api/znc-proxy.ts | 2 +- src/app/browser/app.tsx | 4 +- src/app/main/index.ts | 2 +- src/app/main/menu.ts | 4 +- src/app/main/na-auth.ts | 4 +- src/app/main/webservices.ts | 2 +- src/app/preload/index.ts | 4 +- src/cli-entry.ts | 6 ++- src/cli.ts | 40 ++++++++++--------- src/cli/nooklink/dump-newspapers.ts | 4 +- src/cli/nooklink/island.ts | 2 +- src/cli/nooklink/keyboard.ts | 2 +- src/cli/nooklink/newspaper.ts | 2 +- src/cli/nooklink/newspapers.ts | 2 +- src/cli/nooklink/post-reaction.ts | 2 +- src/cli/nooklink/reactions.ts | 2 +- src/cli/nooklink/user.ts | 2 +- src/cli/nooklink/users.ts | 2 +- src/cli/nso.ts | 2 +- src/cli/nso/announcements.ts | 2 +- src/cli/nso/auth.ts | 2 +- src/cli/nso/friends.ts | 2 +- src/cli/nso/http-server.ts | 4 +- src/cli/nso/notify.ts | 4 +- src/cli/nso/permissions.ts | 2 +- src/cli/nso/presence.ts | 2 +- src/cli/nso/token.ts | 2 +- src/cli/nso/user.ts | 2 +- src/cli/nso/webservices.ts | 2 +- src/cli/nso/webservicetoken.ts | 2 +- src/cli/nso/znc-proxy-tokens.ts | 2 +- src/cli/pctl.ts | 6 ++- src/cli/pctl/auth.ts | 4 +- src/cli/pctl/daily-summaries.ts | 4 +- src/cli/pctl/devices.ts | 4 +- src/cli/pctl/dump-summaries.ts | 4 +- src/cli/pctl/monthly-summaries.ts | 4 +- src/cli/pctl/monthly-summary.ts | 4 +- src/cli/pctl/settings.ts | 4 +- src/cli/pctl/token.ts | 4 +- src/cli/pctl/user.ts | 4 +- src/cli/splatnet2/battles.ts | 2 +- src/cli/splatnet2/challenges.ts | 2 +- src/cli/splatnet2/dump-records.ts | 2 +- src/cli/splatnet2/dump-results.ts | 2 +- src/cli/splatnet2/hero.ts | 2 +- src/cli/splatnet2/monitor.ts | 2 +- src/cli/splatnet2/schedule.ts | 2 +- src/cli/splatnet2/stages.ts | 2 +- src/cli/splatnet2/user.ts | 2 +- src/cli/splatnet2/weapons.ts | 2 +- src/cli/users.ts | 4 +- src/cli/util/captureid.ts | 2 +- src/cli/util/discord-activity.ts | 4 +- src/cli/util/discord-rpc.ts | 2 +- src/cli/util/export-discord-titles.ts | 2 +- src/cli/util/validate-discord-titles.ts | 2 +- src/{cli/pctl/util.ts => common/auth/moon.ts} | 2 +- .../util.ts => common/auth/nooklink.ts} | 4 +- src/{cli/nso/util.ts => common/auth/nso.ts} | 2 +- .../util.ts => common/auth/splatnet2.ts} | 12 +++--- src/common/notify.ts | 2 +- src/common/splatnet2/monitor.ts | 2 +- 64 files changed, 120 insertions(+), 107 deletions(-) rename src/{cli/pctl/util.ts => common/auth/moon.ts} (98%) rename src/{cli/nooklink/util.ts => common/auth/nooklink.ts} (98%) rename src/{cli/nso/util.ts => common/auth/nso.ts} (98%) rename src/{cli/splatnet2/util.ts => common/auth/splatnet2.ts} (94%) diff --git a/src/api/splatnet2.ts b/src/api/splatnet2.ts index 66040fb..22635bd 100644 --- a/src/api/splatnet2.ts +++ b/src/api/splatnet2.ts @@ -6,7 +6,6 @@ import { NintendoAccountUser } from './na.js'; import { ErrorResponse } from './util.js'; import ZncApi from './znc.js'; import { ActiveFestivals, CoopResult, CoopResults, CoopSchedules, HeroRecords, NicknameAndIcons, PastFestivals, Records, Result, Results, Schedules, ShareResponse, ShopMerchandises, Stages, Timeline, WebServiceError, XPowerRankingSummary } from './splatnet2-types.js'; -import { updateIksmSessionLastUsed } from '../cli/splatnet2/util.js'; const debug = createDebug('nxapi:api:splatnet2'); @@ -19,6 +18,10 @@ const SPLATNET2_URL = SPLATNET2_WEBSERVICE_URL + 'api'; const XPOWERRANKING_SEASON = /^(\d{2})(\d{2})01T00_(\d{2})(\d{2})01T00$/; const LEAGUE_ID = /^(\d{2})(\d{2})(\d{2})(\d{2})(T|P)$/; +export const updateIksmSessionLastUsed: { + handler?: ((iksm_session: string) => void); +} = {}; + export default class SplatNet2Api { constructor( public iksm_session: string, @@ -46,7 +49,7 @@ export default class SplatNet2Api { throw new ErrorResponse('[splatnet2] Unknown error', response, await response.text()); } - updateIksmSessionLastUsed(this.iksm_session); + updateIksmSessionLastUsed.handler?.call(null, this.iksm_session); const data = await response.json() as T | WebServiceError; diff --git a/src/api/znc-proxy.ts b/src/api/znc-proxy.ts index 4f1c482..abddae9 100644 --- a/src/api/znc-proxy.ts +++ b/src/api/znc-proxy.ts @@ -5,7 +5,7 @@ import { ErrorResponse } from './util.js'; import ZncApi from './znc.js'; import { version } from '../util.js'; import { NintendoAccountUser } from './na.js'; -import { SavedToken } from '../cli/nso/util.js'; +import { SavedToken } from '../common/auth/nso.js'; const debug = createDebug('nxapi:api:znc-proxy'); diff --git a/src/app/browser/app.tsx b/src/app/browser/app.tsx index 521751d..dd63d33 100644 --- a/src/app/browser/app.tsx +++ b/src/app/browser/app.tsx @@ -1,8 +1,8 @@ import React, { useCallback } from 'react'; import { StyleSheet, Text, useColorScheme, View } from 'react-native'; import { NintendoAccountUser } from '../../api/na.js'; -import { SavedToken } from '../../cli/nso/util.js'; -import { SavedMoonToken } from '../../cli/pctl/util.js'; +import { SavedToken } from '../../common/auth/nso.js'; +import { SavedMoonToken } from '../../common/auth/moon.js'; import ipc from './ipc.js'; import { useAsync } from './util.js'; diff --git a/src/app/main/index.ts b/src/app/main/index.ts index 96d1b72..7777246 100644 --- a/src/app/main/index.ts +++ b/src/app/main/index.ts @@ -15,7 +15,7 @@ import { CurrentUser, Friend, Game, ZncErrorResponse } from '../../api/znc-types import { ErrorResponse } from '../../api/util.js'; import { ZncDiscordPresence } from '../../common/presence.js'; import { NotificationManager } from '../../common/notify.js'; -import { getToken } from '../../cli/nso/util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('app:main'); diff --git a/src/app/main/menu.ts b/src/app/main/menu.ts index 0f0f454..be5c3c6 100644 --- a/src/app/main/menu.ts +++ b/src/app/main/menu.ts @@ -4,8 +4,8 @@ import { addNsoAccount, addPctlAccount } from './na-auth.js'; import { PresenceMonitorManager, Store } from './index.js'; import { WebService } from '../../api/znc-types.js'; import openWebService from './webservices.js'; -import { getToken, SavedToken } from '../../cli/nso/util.js'; -import { SavedMoonToken } from '../../cli/pctl/util.js'; +import { getToken, SavedToken } from '../../common/auth/nso.js'; +import { SavedMoonToken } from '../../common/auth/moon.js'; import { dev } from '../../util.js'; const debug = createDebug('app:main:menu'); diff --git a/src/app/main/na-auth.ts b/src/app/main/na-auth.ts index 32ecf53..45974e5 100644 --- a/src/app/main/na-auth.ts +++ b/src/app/main/na-auth.ts @@ -7,8 +7,8 @@ import { getNintendoAccountSessionToken, NintendoAccountSessionToken } from '../ import { Jwt } from '../../util.js'; import { ZNCA_CLIENT_ID } from '../../api/znc.js'; import { ZNMA_CLIENT_ID } from '../../api/moon.js'; -import { getToken, SavedToken } from '../../cli/nso/util.js'; -import { getPctlToken, SavedMoonToken } from '../../cli/pctl/util.js'; +import { getToken, SavedToken } from '../../common/auth/nso.js'; +import { getPctlToken, SavedMoonToken } from '../../common/auth/moon.js'; const debug = createDebug('app:main:na-auth'); diff --git a/src/app/main/webservices.ts b/src/app/main/webservices.ts index 06230d5..715d1ed 100644 --- a/src/app/main/webservices.ts +++ b/src/app/main/webservices.ts @@ -6,7 +6,7 @@ import { dev } from '../../util.js'; import { WebService } from '../../api/znc-types.js'; import { bundlepath, Store } from './index.js'; import type { NativeShareRequest, NativeShareUrlRequest } from '../preload-webservice/znca-js-api.js'; -import { SavedToken } from '../../cli/nso/util.js'; +import { SavedToken } from '../../common/auth/nso.js'; const debug = createDebug('app:main:webservices'); diff --git a/src/app/preload/index.ts b/src/app/preload/index.ts index ff7899e..34e3af5 100644 --- a/src/app/preload/index.ts +++ b/src/app/preload/index.ts @@ -1,8 +1,8 @@ import { contextBridge, ipcRenderer } from 'electron'; import { EventEmitter } from 'events'; import { WindowConfiguration } from '../common/types.js'; -import { SavedToken } from '../../cli/nso/util.js'; -import { SavedMoonToken } from '../../cli/pctl/util.js'; +import { SavedToken } from '../../common/auth/nso.js'; +import { SavedMoonToken } from '../../common/auth/moon.js'; const ipc = { getWindowData: () => ipcRenderer.sendSync('nxapi:browser:getwindowdata') as WindowConfiguration, diff --git a/src/cli-entry.ts b/src/cli-entry.ts index 0742cb7..6ff9091 100644 --- a/src/cli-entry.ts +++ b/src/cli-entry.ts @@ -1,7 +1,9 @@ -// #!/usr/bin/env node - import createDebug from 'debug'; +// +// cli entrypoint for Rollup bundle +// + createDebug.log = console.warn.bind(console); import('./cli.js').then(cli => cli.main.call(null)); diff --git a/src/cli.ts b/src/cli.ts index 1978cf1..79e0f7a 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -18,31 +18,35 @@ if (process.env.NXAPI_DATA_PATH) dotenvExpand.expand(dotenv.config({ if (process.env.DEBUG) createDebug.enable(process.env.DEBUG); -const yargs = Yargs(process.argv.slice(2)).option('data-path', { - describe: 'Data storage path', - type: 'string', - default: process.env.NXAPI_DATA_PATH || paths.data, -}); +export function createYargs(argv: string[]) { + const yargs = Yargs(argv).option('data-path', { + describe: 'Data storage path', + type: 'string', + default: process.env.NXAPI_DATA_PATH || paths.data, + }); -export type Arguments = YargsArguments; + for (const command of Object.values(commands)) { + if (command.command === 'app' && !dev) continue; -for (const command of Object.values(commands)) { - if (command.command === 'app' && !dev) continue; + // @ts-expect-error + yargs.command(command); + } - // @ts-expect-error - yargs.command(command); + yargs + .scriptName('nxapi') + .demandCommand() + .help() + // .version(false) + .showHelpOnFail(false, 'Specify --help for available options'); + + return yargs; } -yargs - .scriptName('nxapi') - .demandCommand() - .help() - // .version(false) - .showHelpOnFail(false, 'Specify --help for available options'); +export type Arguments = YargsArguments>; -export default yargs; +export async function main(argv = process.argv.slice(2)) { + const yargs = createYargs(argv); -export async function main() { if (!process.env.NXAPI_SKIP_UPDATE_CHECK) await checkUpdates(); yargs.argv; diff --git a/src/cli/nooklink/dump-newspapers.ts b/src/cli/nooklink/dump-newspapers.ts index fb86943..9bdedc7 100644 --- a/src/cli/nooklink/dump-newspapers.ts +++ b/src/cli/nooklink/dump-newspapers.ts @@ -1,10 +1,10 @@ -import createDebug from 'debug'; import * as fs from 'fs/promises'; import * as path from 'path'; +import createDebug from 'debug'; import mkdirp from 'mkdirp'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getUserToken } from './util.js'; +import { getUserToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:dump-newspapers'); diff --git a/src/cli/nooklink/island.ts b/src/cli/nooklink/island.ts index e1ef98e..0299283 100644 --- a/src/cli/nooklink/island.ts +++ b/src/cli/nooklink/island.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getUserToken, getWebServiceToken } from './util.js'; +import { getUserToken, getWebServiceToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:island'); diff --git a/src/cli/nooklink/keyboard.ts b/src/cli/nooklink/keyboard.ts index 8690a84..a1acd22 100644 --- a/src/cli/nooklink/keyboard.ts +++ b/src/cli/nooklink/keyboard.ts @@ -2,7 +2,7 @@ import { promisify } from 'util'; import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getUserToken } from './util.js'; +import { getUserToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:keyboard'); diff --git a/src/cli/nooklink/newspaper.ts b/src/cli/nooklink/newspaper.ts index 37525e6..0aa662c 100644 --- a/src/cli/nooklink/newspaper.ts +++ b/src/cli/nooklink/newspaper.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getUserToken } from './util.js'; +import { getUserToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:newspaper'); diff --git a/src/cli/nooklink/newspapers.ts b/src/cli/nooklink/newspapers.ts index 36da340..19bec0f 100644 --- a/src/cli/nooklink/newspapers.ts +++ b/src/cli/nooklink/newspapers.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getUserToken } from './util.js'; +import { getUserToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:newspapers'); diff --git a/src/cli/nooklink/post-reaction.ts b/src/cli/nooklink/post-reaction.ts index 3614fd3..2ba69ca 100644 --- a/src/cli/nooklink/post-reaction.ts +++ b/src/cli/nooklink/post-reaction.ts @@ -1,7 +1,7 @@ import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getUserToken } from './util.js'; +import { getUserToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:post-reaction'); diff --git a/src/cli/nooklink/reactions.ts b/src/cli/nooklink/reactions.ts index 9f0fb26..a778a56 100644 --- a/src/cli/nooklink/reactions.ts +++ b/src/cli/nooklink/reactions.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getUserToken } from './util.js'; +import { getUserToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:reactions'); diff --git a/src/cli/nooklink/user.ts b/src/cli/nooklink/user.ts index 649f90b..5292529 100644 --- a/src/cli/nooklink/user.ts +++ b/src/cli/nooklink/user.ts @@ -1,7 +1,7 @@ import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getUserToken } from './util.js'; +import { getUserToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:user'); diff --git a/src/cli/nooklink/users.ts b/src/cli/nooklink/users.ts index ad94dc0..17a5acf 100644 --- a/src/cli/nooklink/users.ts +++ b/src/cli/nooklink/users.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../nooklink.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getWebServiceToken } from './util.js'; +import { getWebServiceToken } from '../../common/auth/nooklink.js'; const debug = createDebug('cli:nooklink:users'); diff --git a/src/cli/nso.ts b/src/cli/nso.ts index 8bc46ac..5cdedfc 100644 --- a/src/cli/nso.ts +++ b/src/cli/nso.ts @@ -10,7 +10,7 @@ export const desc = 'Nintendo Switch Online'; export function builder(yargs: Argv) { for (const command of Object.values(commands)) { - // @ts-ignore + // @ts-expect-error yargs.command(command); } diff --git a/src/cli/nso/announcements.ts b/src/cli/nso/announcements.ts index 3b029c2..4aaeccd 100644 --- a/src/cli/nso/announcements.ts +++ b/src/cli/nso/announcements.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('cli:nso:announcements'); diff --git a/src/cli/nso/auth.ts b/src/cli/nso/auth.ts index ad9f0ad..0b2a7e5 100644 --- a/src/cli/nso/auth.ts +++ b/src/cli/nso/auth.ts @@ -3,7 +3,7 @@ import createDebug from 'debug'; import * as crypto from 'crypto'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; import { getNintendoAccountSessionToken } from '../../api/na.js'; import { ZNCA_CLIENT_ID } from '../../api/znc.js'; diff --git a/src/cli/nso/friends.ts b/src/cli/nso/friends.ts index dbba4ad..78909fc 100644 --- a/src/cli/nso/friends.ts +++ b/src/cli/nso/friends.ts @@ -3,7 +3,7 @@ import Table from '../util/table.js'; import { PresenceState } from '../../api/znc-types.js'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, hrduration, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('cli:nso:friends'); diff --git a/src/cli/nso/http-server.ts b/src/cli/nso/http-server.ts index f90e06a..35c4b8c 100644 --- a/src/cli/nso/http-server.ts +++ b/src/cli/nso/http-server.ts @@ -1,13 +1,13 @@ +import * as net from 'net'; import createDebug from 'debug'; import express, { Request, Response } from 'express'; import bodyParser from 'body-parser'; -import * as net from 'net'; import { v4 as uuidgen } from 'uuid'; import { Announcement, CurrentUser, Friend, GetActiveEventResult, Presence, WebService } from '../../api/znc-types.js'; import ZncApi from '../../api/znc.js'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken, SavedToken } from './util.js'; +import { getToken, SavedToken } from '../../common/auth/nso.js'; import { NotificationManager, ZncNotifications } from '../../common/notify.js'; declare global { diff --git a/src/cli/nso/notify.ts b/src/cli/nso/notify.ts index 225a1bb..e073de1 100644 --- a/src/cli/nso/notify.ts +++ b/src/cli/nso/notify.ts @@ -4,8 +4,8 @@ import persist from 'node-persist'; import notifier from 'node-notifier'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; -import { getIksmToken } from '../splatnet2/util.js'; +import { getToken } from '../../common/auth/nso.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; import { EmbeddedSplatNet2Monitor, NotificationManager, ZncNotifications } from '../../common/notify.js'; import { CurrentUser, Friend, Game } from '../../api/znc-types.js'; diff --git a/src/cli/nso/permissions.ts b/src/cli/nso/permissions.ts index dbe4950..5eecefc 100644 --- a/src/cli/nso/permissions.ts +++ b/src/cli/nso/permissions.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import { PresencePermissions } from '../../api/znc-types.js'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('cli:nso:permissions'); diff --git a/src/cli/nso/presence.ts b/src/cli/nso/presence.ts index 5b66272..d2536b3 100644 --- a/src/cli/nso/presence.ts +++ b/src/cli/nso/presence.ts @@ -1,7 +1,7 @@ import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; import { DiscordPresencePlayTime } from '../../discord/util.js'; import { handleEnableSplatNet2Monitoring } from './notify.js'; import { ZncDiscordPresence, ZncProxyDiscordPresence } from '../../common/presence.js'; diff --git a/src/cli/nso/token.ts b/src/cli/nso/token.ts index 583e216..4b7289a 100644 --- a/src/cli/nso/token.ts +++ b/src/cli/nso/token.ts @@ -2,7 +2,7 @@ import * as util from 'util'; import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('cli:nso:token'); diff --git a/src/cli/nso/user.ts b/src/cli/nso/user.ts index eb1af20..a9f526a 100644 --- a/src/cli/nso/user.ts +++ b/src/cli/nso/user.ts @@ -1,7 +1,7 @@ import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('cli:nso:user'); diff --git a/src/cli/nso/webservices.ts b/src/cli/nso/webservices.ts index 95e0934..18c0171 100644 --- a/src/cli/nso/webservices.ts +++ b/src/cli/nso/webservices.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('cli:nso:webservices'); diff --git a/src/cli/nso/webservicetoken.ts b/src/cli/nso/webservicetoken.ts index 07b0a71..7047a86 100644 --- a/src/cli/nso/webservicetoken.ts +++ b/src/cli/nso/webservicetoken.ts @@ -1,7 +1,7 @@ import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../nso.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('cli:nso:webservicetoken'); diff --git a/src/cli/nso/znc-proxy-tokens.ts b/src/cli/nso/znc-proxy-tokens.ts index c2a02d9..301f05f 100644 --- a/src/cli/nso/znc-proxy-tokens.ts +++ b/src/cli/nso/znc-proxy-tokens.ts @@ -3,7 +3,7 @@ import fetch from 'node-fetch'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../nso.js'; import { Argv, initStorage } from '../../util.js'; -import { getToken } from './util.js'; +import { getToken } from '../../common/auth/nso.js'; import { AuthPolicy, AuthToken } from './http-server.js'; const debug = createDebug('cli:nso:znc-proxy-tokens'); diff --git a/src/cli/pctl.ts b/src/cli/pctl.ts index 7faed10..e842ba8 100644 --- a/src/cli/pctl.ts +++ b/src/cli/pctl.ts @@ -1,6 +1,6 @@ import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../cli.js'; -import { Argv } from '../util.js'; +import { Argv, YargsArguments } from '../util.js'; import * as commands from './pctl/index.js'; const debug = createDebug('cli:pctl'); @@ -13,4 +13,8 @@ export function builder(yargs: Argv) { // @ts-expect-error yargs.command(command); } + + return yargs; } + +export type Arguments = YargsArguments>; diff --git a/src/cli/pctl/auth.ts b/src/cli/pctl/auth.ts index 07c3b52..ae36bd2 100644 --- a/src/cli/pctl/auth.ts +++ b/src/cli/pctl/auth.ts @@ -1,9 +1,9 @@ import * as util from 'util'; import * as crypto from 'crypto'; import createDebug from 'debug'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; import { getNintendoAccountSessionToken } from '../../api/na.js'; import { ZNMA_CLIENT_ID } from '../../api/moon.js'; diff --git a/src/cli/pctl/daily-summaries.ts b/src/cli/pctl/daily-summaries.ts index cabb6b7..b4702f2 100644 --- a/src/cli/pctl/daily-summaries.ts +++ b/src/cli/pctl/daily-summaries.ts @@ -1,8 +1,8 @@ import createDebug from 'debug'; import Table from '../util/table.js'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, hrduration, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; const debug = createDebug('cli:pctl:daily-summaries'); diff --git a/src/cli/pctl/devices.ts b/src/cli/pctl/devices.ts index f0b74bd..7b9ac10 100644 --- a/src/cli/pctl/devices.ts +++ b/src/cli/pctl/devices.ts @@ -1,8 +1,8 @@ import createDebug from 'debug'; import Table from '../util/table.js'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; const debug = createDebug('cli:pctl:devices'); diff --git a/src/cli/pctl/dump-summaries.ts b/src/cli/pctl/dump-summaries.ts index 0e85fc2..ec0e95d 100644 --- a/src/cli/pctl/dump-summaries.ts +++ b/src/cli/pctl/dump-summaries.ts @@ -2,9 +2,9 @@ import * as path from 'path'; import * as fs from 'fs/promises'; import createDebug from 'debug'; import mkdirp from 'mkdirp'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; import { DailySummaryResult } from '../../api/moon-types.js'; import MoonApi from '../../api/moon.js'; diff --git a/src/cli/pctl/monthly-summaries.ts b/src/cli/pctl/monthly-summaries.ts index c5663c7..88e415d 100644 --- a/src/cli/pctl/monthly-summaries.ts +++ b/src/cli/pctl/monthly-summaries.ts @@ -1,8 +1,8 @@ import createDebug from 'debug'; import Table from '../util/table.js'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; const debug = createDebug('cli:pctl:monthly-summaries'); diff --git a/src/cli/pctl/monthly-summary.ts b/src/cli/pctl/monthly-summary.ts index 7e0acb2..f1368bd 100644 --- a/src/cli/pctl/monthly-summary.ts +++ b/src/cli/pctl/monthly-summary.ts @@ -1,8 +1,8 @@ import createDebug from 'debug'; import Table from '../util/table.js'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; const debug = createDebug('cli:pctl:monthly-summary'); diff --git a/src/cli/pctl/settings.ts b/src/cli/pctl/settings.ts index e043c52..66bbb3f 100644 --- a/src/cli/pctl/settings.ts +++ b/src/cli/pctl/settings.ts @@ -1,7 +1,7 @@ import createDebug from 'debug'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; const debug = createDebug('cli:pctl:settings'); diff --git a/src/cli/pctl/token.ts b/src/cli/pctl/token.ts index 502bb80..c0ccff7 100644 --- a/src/cli/pctl/token.ts +++ b/src/cli/pctl/token.ts @@ -1,8 +1,8 @@ import * as util from 'util'; import createDebug from 'debug'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; const debug = createDebug('cli:pctl:token'); diff --git a/src/cli/pctl/user.ts b/src/cli/pctl/user.ts index 5247885..e79d955 100644 --- a/src/cli/pctl/user.ts +++ b/src/cli/pctl/user.ts @@ -1,7 +1,7 @@ import createDebug from 'debug'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../pctl.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getPctlToken } from './util.js'; +import { getPctlToken } from '../../common/auth/moon.js'; const debug = createDebug('cli:pctl:user'); diff --git a/src/cli/splatnet2/battles.ts b/src/cli/splatnet2/battles.ts index 9aa4c47..9016d8c 100644 --- a/src/cli/splatnet2/battles.ts +++ b/src/cli/splatnet2/battles.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; const debug = createDebug('cli:splatnet2:battles'); diff --git a/src/cli/splatnet2/challenges.ts b/src/cli/splatnet2/challenges.ts index 362d878..1466c17 100644 --- a/src/cli/splatnet2/challenges.ts +++ b/src/cli/splatnet2/challenges.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; const debug = createDebug('cli:splatnet2:challenges'); diff --git a/src/cli/splatnet2/dump-records.ts b/src/cli/splatnet2/dump-records.ts index 7b3e41a..3547c21 100644 --- a/src/cli/splatnet2/dump-records.ts +++ b/src/cli/splatnet2/dump-records.ts @@ -4,7 +4,7 @@ import createDebug from 'debug'; import mkdirp from 'mkdirp'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; import { dumpChallenges, dumpHeroRecords, dumpProfileImage, dumpRecords } from '../../common/splatnet2/dump-records.js'; const debug = createDebug('cli:splatnet2:dump-records'); diff --git a/src/cli/splatnet2/dump-results.ts b/src/cli/splatnet2/dump-results.ts index bc83fa9..b16425f 100644 --- a/src/cli/splatnet2/dump-results.ts +++ b/src/cli/splatnet2/dump-results.ts @@ -3,7 +3,7 @@ import createDebug from 'debug'; import mkdirp from 'mkdirp'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; import { dumpCoopResults, dumpResults } from '../../common/splatnet2/dump-results.js'; const debug = createDebug('cli:splatnet2:dump-results'); diff --git a/src/cli/splatnet2/hero.ts b/src/cli/splatnet2/hero.ts index 3ede163..0382776 100644 --- a/src/cli/splatnet2/hero.ts +++ b/src/cli/splatnet2/hero.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; const debug = createDebug('cli:splatnet2:hero'); diff --git a/src/cli/splatnet2/monitor.ts b/src/cli/splatnet2/monitor.ts index 4c1594b..697e1ca 100644 --- a/src/cli/splatnet2/monitor.ts +++ b/src/cli/splatnet2/monitor.ts @@ -1,6 +1,6 @@ import * as path from 'path'; import createDebug from 'debug'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; import { Arguments as ParentArguments } from '../splatnet2.js'; import { SplatNet2RecordsMonitor } from '../../common/splatnet2/monitor.js'; diff --git a/src/cli/splatnet2/schedule.ts b/src/cli/splatnet2/schedule.ts index 869e71c..2d0e11c 100644 --- a/src/cli/splatnet2/schedule.ts +++ b/src/cli/splatnet2/schedule.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; const debug = createDebug('cli:splatnet2:schedule'); diff --git a/src/cli/splatnet2/stages.ts b/src/cli/splatnet2/stages.ts index b5ef6e0..4684c54 100644 --- a/src/cli/splatnet2/stages.ts +++ b/src/cli/splatnet2/stages.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; const debug = createDebug('cli:splatnet2:stages'); diff --git a/src/cli/splatnet2/user.ts b/src/cli/splatnet2/user.ts index 68f1c71..bc3fdad 100644 --- a/src/cli/splatnet2/user.ts +++ b/src/cli/splatnet2/user.ts @@ -1,7 +1,7 @@ import createDebug from 'debug'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; const debug = createDebug('cli:splatnet2:user'); diff --git a/src/cli/splatnet2/weapons.ts b/src/cli/splatnet2/weapons.ts index a416e26..a114732 100644 --- a/src/cli/splatnet2/weapons.ts +++ b/src/cli/splatnet2/weapons.ts @@ -2,7 +2,7 @@ import createDebug from 'debug'; import Table from '../util/table.js'; import type { Arguments as ParentArguments } from '../splatnet2.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getIksmToken } from './util.js'; +import { getIksmToken } from '../../common/auth/splatnet2.js'; const debug = createDebug('cli:splatnet2:weapons'); diff --git a/src/cli/users.ts b/src/cli/users.ts index 2995a9a..3989a56 100644 --- a/src/cli/users.ts +++ b/src/cli/users.ts @@ -2,8 +2,8 @@ import createDebug from 'debug'; import Table from './util/table.js'; import type { Arguments as ParentArguments } from '../cli.js'; import { Argv, initStorage } from '../util.js'; -import { SavedToken } from './nso/util.js'; -import { SavedMoonToken } from './pctl/util.js'; +import { SavedToken } from '../common/auth/nso.js'; +import { SavedMoonToken } from '../common/auth/moon.js'; const debug = createDebug('cli:users'); diff --git a/src/cli/util/captureid.ts b/src/cli/util/captureid.ts index 45f9634..0d4e06c 100644 --- a/src/cli/util/captureid.ts +++ b/src/cli/util/captureid.ts @@ -1,7 +1,7 @@ import * as crypto from 'crypto'; import { Buffer } from 'buffer'; import createDebug from 'debug'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../util.js'; import { Argv } from '../../util.js'; const debug = createDebug('cli:util:captureid'); diff --git a/src/cli/util/discord-activity.ts b/src/cli/util/discord-activity.ts index f4c0fb6..8148c9f 100644 --- a/src/cli/util/discord-activity.ts +++ b/src/cli/util/discord-activity.ts @@ -2,10 +2,10 @@ import createDebug from 'debug'; import fetch from 'node-fetch'; import { getPresenceFromUrl } from '../../api/znc-proxy.js'; import { ActiveEvent, CurrentUser, Friend, Game, Presence, PresenceState } from '../../api/znc-types.js'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../util.js'; import { DiscordPresenceContext, DiscordPresencePlayTime, getDiscordPresence, getInactiveDiscordPresence } from '../../discord/util.js'; import { ArgumentsCamelCase, Argv, initStorage, YargsArguments } from '../../util.js'; -import { getToken } from '../nso/util.js'; +import { getToken } from '../../common/auth/nso.js'; const debug = createDebug('cli:util:discord-activity'); diff --git a/src/cli/util/discord-rpc.ts b/src/cli/util/discord-rpc.ts index 6ce3952..79f3b7a 100644 --- a/src/cli/util/discord-rpc.ts +++ b/src/cli/util/discord-rpc.ts @@ -1,5 +1,5 @@ import createDebug from 'debug'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../util.js'; import { DiscordRpcClient, getAllIpcSockets } from '../../discord/rpc.js'; import { defaultTitle } from '../../discord/titles.js'; import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util.js'; diff --git a/src/cli/util/export-discord-titles.ts b/src/cli/util/export-discord-titles.ts index 6a4252b..3760bdb 100644 --- a/src/cli/util/export-discord-titles.ts +++ b/src/cli/util/export-discord-titles.ts @@ -1,6 +1,6 @@ import createDebug from 'debug'; import fetch from 'node-fetch'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../util.js'; import { ArgumentsCamelCase, Argv, YargsArguments } from '../../util.js'; import { titles as unsorted_titles } from '../../discord/titles.js'; import { DiscordApplicationRpc, getDiscordApplicationRpc } from './discord-activity.js'; diff --git a/src/cli/util/validate-discord-titles.ts b/src/cli/util/validate-discord-titles.ts index acda58a..b58ca21 100644 --- a/src/cli/util/validate-discord-titles.ts +++ b/src/cli/util/validate-discord-titles.ts @@ -1,5 +1,5 @@ import createDebug from 'debug'; -import type { Arguments as ParentArguments } from '../../cli.js'; +import type { Arguments as ParentArguments } from '../util.js'; import { ArgumentsCamelCase } from '../../util.js'; import * as publishers from '../../discord/titles/index.js'; diff --git a/src/cli/pctl/util.ts b/src/common/auth/moon.ts similarity index 98% rename from src/cli/pctl/util.ts rename to src/common/auth/moon.ts index b30a1aa..d1104dd 100644 --- a/src/cli/pctl/util.ts +++ b/src/common/auth/moon.ts @@ -5,7 +5,7 @@ import { NintendoAccountSessionTokenJwtPayload, NintendoAccountToken, NintendoAc import { Jwt } from '../../util.js'; import MoonApi from '../../api/moon.js'; -const debug = createDebug('cli:nso'); +const debug = createDebug('nxapi:auth:moon'); export interface SavedMoonToken { nintendoAccountToken: NintendoAccountToken; diff --git a/src/cli/nooklink/util.ts b/src/common/auth/nooklink.ts similarity index 98% rename from src/cli/nooklink/util.ts rename to src/common/auth/nooklink.ts index ae93e47..67937b8 100644 --- a/src/cli/nooklink/util.ts +++ b/src/common/auth/nooklink.ts @@ -1,11 +1,11 @@ import createDebug from 'debug'; import persist from 'node-persist'; -import { getToken } from '../nso/util.js'; +import { getToken } from './nso.js'; import NooklinkApi, { NooklinkUserApi } from '../../api/nooklink.js'; import { AuthToken, Users } from '../../api/nooklink-types.js'; import { WebServiceToken } from '../../api/znc-types.js'; -const debug = createDebug('cli:nooklink'); +const debug = createDebug('nxapi:auth:nooklink'); export interface SavedToken { webserviceToken: WebServiceToken; diff --git a/src/cli/nso/util.ts b/src/common/auth/nso.ts similarity index 98% rename from src/cli/nso/util.ts rename to src/common/auth/nso.ts index a0028b2..f552890 100644 --- a/src/cli/nso/util.ts +++ b/src/common/auth/nso.ts @@ -7,7 +7,7 @@ import { AccountLogin } from '../../api/znc-types.js'; import ZncApi, { ZNCA_CLIENT_ID } from '../../api/znc.js'; import ZncProxyApi from '../../api/znc-proxy.js'; -const debug = createDebug('cli:nso'); +const debug = createDebug('nxapi:auth:nso'); export interface SavedToken { uuid: string; diff --git a/src/cli/splatnet2/util.ts b/src/common/auth/splatnet2.ts similarity index 94% rename from src/cli/splatnet2/util.ts rename to src/common/auth/splatnet2.ts index 1517395..ad48f25 100644 --- a/src/cli/splatnet2/util.ts +++ b/src/common/auth/splatnet2.ts @@ -1,11 +1,11 @@ +import * as fs from 'fs'; import createDebug from 'debug'; import persist from 'node-persist'; -import * as fs from 'fs'; -import { getToken } from '../nso/util.js'; -import SplatNet2Api from '../../api/splatnet2.js'; +import { getToken } from './nso.js'; +import SplatNet2Api, { updateIksmSessionLastUsed } from '../../api/splatnet2.js'; import { WebServiceToken } from '../../api/znc-types.js'; -const debug = createDebug('cli:splatnet2'); +const debug = createDebug('nxapi:auth:splatnet2'); export interface SavedIksmSessionToken { webserviceToken: WebServiceToken; @@ -89,7 +89,7 @@ export async function renewIksmToken(splatnet: SplatNet2Api, storage: persist.Lo const iksm_sessions = new Map(); -export function updateIksmSessionLastUsed(iksm_session: string, last_used: number = Date.now()) { +updateIksmSessionLastUsed.handler = (iksm_session: string, last_used: number = Date.now()) => { const match = iksm_sessions.get(iksm_session); if (!match) return; @@ -107,7 +107,7 @@ export function updateIksmSessionLastUsed(iksm_session: string, last_used: numbe }, 1000); iksm_sessions.set(iksm_session, [storage, token, last_used, new_timeout]); -} +}; function writeUpdatedIksmSessionLastUsed(storage: persist.LocalStorage, token: string, last_used: number) { const datum_str = fs.readFileSync(storage.getDatumPath('IksmToken.' + token), 'utf-8'); diff --git a/src/common/notify.ts b/src/common/notify.ts index 84c331f..413fea5 100644 --- a/src/common/notify.ts +++ b/src/common/notify.ts @@ -5,7 +5,7 @@ import ZncApi from '../api/znc.js'; import { ActiveEvent, Announcements, CurrentUser, Friend, Game, Presence, PresenceState, WebServices, ZncErrorResponse } from '../api/znc-types.js'; import ZncProxyApi from '../api/znc-proxy.js'; import { ErrorResponse } from '../api/util.js'; -import { SavedToken } from '../cli/nso/util.js'; +import { SavedToken } from './auth/nso.js'; import { SplatNet2RecordsMonitor } from './splatnet2/monitor.js'; const debug = createDebug('nxapi:nso:notify'); diff --git a/src/common/splatnet2/monitor.ts b/src/common/splatnet2/monitor.ts index 5de56ea..6861eb0 100644 --- a/src/common/splatnet2/monitor.ts +++ b/src/common/splatnet2/monitor.ts @@ -4,7 +4,7 @@ import createDebug from 'debug'; import persist from 'node-persist'; import mkdirp from 'mkdirp'; import SplatNet2Api from '../../api/splatnet2.js'; -import { renewIksmToken } from '../../cli/splatnet2/util.js'; +import { renewIksmToken } from '../auth/splatnet2.js'; import { Loop, LoopResult } from '../../util.js'; import { Records, Stages, WebServiceError } from '../../api/splatnet2-types.js'; import { dumpCoopResults, dumpResults } from './dump-results.js';