Move authentication functions

app no longer imports from cli

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;
 

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');
 

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';
 

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');
 

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');

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');
 

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');
 

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,

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));

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<typeof yargs>;
+    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<ReturnType<typeof createYargs>>;
 
-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;

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');
 

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');
 

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');
 

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');
 

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');
 

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');
 

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');
 

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');
 

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');
 

src/cli/nso.ts

@@ -10,7 +10,7 @@ export const desc = 'Nintendo Switch Online';
 
 export function builder(yargs: Argv<ParentArguments>) {
     for (const command of Object.values(commands)) {
-        // @ts-ignore
+        // @ts-expect-error
         yargs.command(command);
     }
 

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');
 

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';
 

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');
 

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 {

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';
 

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');
 

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';

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');
 

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');
 

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');
 

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');
 

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');

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<ParentArguments>) {
         // @ts-expect-error
         yargs.command(command);
     }
+
+    return yargs;
 }
+
+export type Arguments = YargsArguments<ReturnType<typeof builder>>;

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';
 

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');
 

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');
 

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';
 

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');
 

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');
 

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');
 

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');
 

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');
 

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');
 

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');
 

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');

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');

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');
 

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';

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');
 

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');
 

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');
 

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');
 

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');
 

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');

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');
 

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';

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';

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';
 

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;

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;

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;

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<string, [persist.LocalStorage, string, number | null, NodeJS.Timeout | null]>();
 
-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');

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');

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';