Add .internal file handling from the setup repo

package.json

@@ -5,7 +5,7 @@
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "scripts": {
-    "compile": "tsc",
+    "compile": "tsc --watch",
     "test": "jest --config jest.config.js",
     "lint": "eslint src --ext .ts --fix",
     "build": "npm run lint && npm run compile && npm run build:browser && npm run build:docs && npm run build:docs.json && npm run test",
@@ -38,12 +38,14 @@
   },
   "homepage": "https://github.com/AzurAPI/azurapi-js#readme",
   "dependencies": {
-    "fuse.js": "^6.4.6"
+    "fuse.js": "^6.4.6",
+    "node-fetch": "^2.6.7"
   },
   "devDependencies": {
     "@augu/eslint-config": "^2.2.0",
     "@types/jest": "^26.0.14",
     "@types/node": "^14.14.45",
+    "@types/node-fetch": "^2.6.2",
     "@typescript-eslint/eslint-plugin": "^5.30.5",
     "@typescript-eslint/parser": "^5.30.5",
     "eslint": "^8.19.0",

src/core/CacheUpdater.ts

@@ -3,10 +3,11 @@
  * Functions relating to updating the cache
  * @packageDocumentation
  */
-import { baseFolder, data, datatype, local } from './Data';
+import { baseFolder, datatype, local, getDataUrl } from './Data';
 import fs from 'fs';
-import { check, fetch } from './UpdateChecker';
+import { check } from './UpdateChecker';
 import { AzurAPI } from './Client';
+import fetch from 'node-fetch';
 
 export default class Updater {
   public cron?: NodeJS.Timeout;
@@ -29,7 +30,22 @@ export default class Updater {
       this.client.emit('updateAvalible', updates);
       return Promise.all(
         updates.map(async (type) => {
-          const raw = JSON.parse(await fetch(data[type])) ?? [];
+          let raw: any = [];
+          try {
+            let response = await fetch(getDataUrl(type));
+            if (response.status === 404) {
+              response = await fetch(getDataUrl(type, { internal: true }));
+            }
+            raw = await response.json();
+
+            if (raw?.length === undefined) {
+              raw = Object.values(raw);
+            }
+          } catch (e) {
+            console.log(`Error while fetching data for ${type} (${getDataUrl(type)})`);
+            console.log(e);
+            return;
+          }
 
           if (type === 'voicelines') {
             /**

src/core/Data.ts

@@ -5,17 +5,27 @@
  */
 import { join } from 'path';
 
-export const data = {
-  version: 'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master/dist/version.json',
-  ships: 'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master/dist/ships.json',
-  equipments:
-    'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master/dist/equipments.json',
-  chapters:
-    'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master/dist/chapters.min.json',
-  voicelines: 'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master/voice_lines.json',
-  barrages: 'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master/dist/barrage.json',
-  shipList: 'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master/dist/ship-list.json',
-  idMap: 'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master/dist/id-map.json',
+const baseDataUrl = 'https://raw.githubusercontent.com/AzurAPI/azurapi-js-setup/master';
+
+export type datatype = 'ships' | 'equipments' | 'voicelines' | 'chapters' | 'barrages';
+
+type UrlType = datatype | 'version' | 'shipList' | 'idMap';
+
+export const getDataUrl = (type: UrlType, options?: { internal?: boolean }) => {
+  const internalString = options?.internal ? '.internal' : '';
+
+  const urls: Record<UrlType, string> = {
+    version: `${baseDataUrl}/dist/version${internalString}.json`,
+    ships: `${baseDataUrl}/dist/ships${internalString}.json`,
+    equipments: `${baseDataUrl}/dist/equipments${internalString}.json`,
+    chapters: `${baseDataUrl}/dist/chapters${internalString}.min.json`,
+    voicelines: `${baseDataUrl}/voice_lines${internalString}.json`,
+    barrages: `${baseDataUrl}/dist/barrage${internalString}.json`,
+    shipList: `${baseDataUrl}/dist/ship-list${internalString}.json`,
+    idMap: `${baseDataUrl}/dist/id-map${internalString}.json`,
+  };
+
+  return urls[type];
 };
 
 export const local = {
@@ -27,9 +37,7 @@ export const local = {
   shipList: join(__dirname, '..', '.azurlane', 'ship-list.json'),
   idMap: join(__dirname, '..', '.azurlane', 'id-map.json'),
 };
-export type datatype = 'ships' | 'equipments' | 'voicelines' | 'chapters' | 'barrages';
 export let baseFolder = join(__dirname, '..', '.azurlane');
 export let versionInfo = join(__dirname, '..', '.azurlane', 'version.json');
 
 Object.freeze(local);
-Object.freeze(data);

src/core/UpdateChecker.ts

@@ -3,9 +3,9 @@
  * Check for updates and functions relating to updates
  * @packageDocumentation
  */
-import { data, datatype, versionInfo } from './Data';
+import { datatype, versionInfo, getDataUrl } from './Data';
 import fs from 'fs';
-import https from 'https';
+import fetch from 'node-fetch';
 
 const supported = ['ships', 'equipments', 'chapters', 'barrages', 'voicelines'];
 
@@ -18,7 +18,8 @@ let remote;
 export async function check(): Promise<datatype[]> {
   if (!version && fs.existsSync(versionInfo))
     version = JSON.parse(fs.readFileSync(versionInfo).toString());
-  remote = JSON.parse(await fetch(data.version));
+  const response = await fetch(getDataUrl('version'));
+  remote = await response.json();
   let needUpdate: datatype[] = [];
   for (let type of supported)
     if (
@@ -38,19 +39,3 @@ export async function check(): Promise<datatype[]> {
 export function save() {
   if (remote) fs.writeFileSync(versionInfo, JSON.stringify((version = remote)));
 }
-
-/**
- * Fetch data
- * @param url URL
- */
-export function fetch(url: string): Promise<string> {
-  return new Promise((resolve, reject) =>
-    https
-      .get(url, (resp) => {
-        let data = '';
-        resp.on('data', (chunk) => (data += chunk));
-        resp.on('end', () => resolve(data));
-      })
-      .on('error', (err) => reject(err))
-  );
-}