From 076e83626b582a95a68788af80c518aabbea32a8 Mon Sep 17 00:00:00 2001
From: Kieran <kieran@harkin.me>
Date: Thu, 20 Jul 2023 12:31:07 +0100
Subject: [PATCH] Fix package

---
 VoidCat/spa/src/api/package.json                 |  2 +-
 VoidCat/spa/src/api/src/Api.ts                   | 12 ++++++------
 VoidCat/spa/src/api/src/Upload.ts                |  6 +++---
 VoidCat/spa/src/api/src/codecBytes.js            | 16 ++++++++--------
 VoidCat/spa/src/api/src/index.ts                 |  6 +++---
 ...{StreamEncryption.ts => stream-encryption.ts} |  6 +++---
 .../{StreamUploader.ts => stream-uploader.ts}    |  6 +++---
 VoidCat/spa/src/api/src/{Util.ts => utils.ts}    |  0
 .../api/src/{XHRUploader.ts => xhr-uploader.ts}  |  6 +++---
 9 files changed, 30 insertions(+), 30 deletions(-)
 rename VoidCat/spa/src/api/src/{StreamEncryption.ts => stream-encryption.ts} (96%)
 rename VoidCat/spa/src/api/src/{StreamUploader.ts => stream-uploader.ts} (95%)
 rename VoidCat/spa/src/api/src/{Util.ts => utils.ts} (100%)
 rename VoidCat/spa/src/api/src/{XHRUploader.ts => xhr-uploader.ts} (94%)

diff --git a/VoidCat/spa/src/api/package.json b/VoidCat/spa/src/api/package.json
index 8287fba..926dbf6 100644
--- a/VoidCat/spa/src/api/package.json
+++ b/VoidCat/spa/src/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@void-cat/api",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "void.cat API package",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
diff --git a/VoidCat/spa/src/api/src/Api.ts b/VoidCat/spa/src/api/src/Api.ts
index f12e10d..0fa3338 100644
--- a/VoidCat/spa/src/api/src/Api.ts
+++ b/VoidCat/spa/src/api/src/Api.ts
@@ -9,9 +9,9 @@ import {
     SiteInfoResponse,
     VoidFileResponse
 } from "./index";
-import {ProgressHandler, ProxyChallengeHandler, StateChangeHandler, VoidUploader} from "./Upload";
-import {StreamUploader} from "./StreamUploader";
-import {XHRUploader} from "./XHRUploader";
+import { ProgressHandler, ProxyChallengeHandler, StateChangeHandler, VoidUploader } from "./upload";
+import { StreamUploader } from "./stream-uploader";
+import { XHRUploader } from "./xhr-uploader";
 
 export class VoidApi {
     readonly #uri: string
@@ -88,11 +88,11 @@ export class VoidApi {
     }
 
     login(username: string, password: string, captcha?: string) {
-        return this.#req<LoginSession>("POST", `/auth/login`, {username, password, captcha});
+        return this.#req<LoginSession>("POST", `/auth/login`, { username, password, captcha });
     }
 
     register(username: string, password: string, captcha?: string) {
-        return this.#req<LoginSession>("POST", `/auth/register`, {username, password, captcha});
+        return this.#req<LoginSession>("POST", `/auth/register`, { username, password, captcha });
     }
 
     getUser(id: string) {
@@ -108,7 +108,7 @@ export class VoidApi {
     }
 
     submitVerifyCode(uid: string, code: string) {
-        return this.#req<void>("POST", `/user/${uid}/verify`, {code});
+        return this.#req<void>("POST", `/user/${uid}/verify`, { code });
     }
 
     sendNewCode(uid: string) {
diff --git a/VoidCat/spa/src/api/src/Upload.ts b/VoidCat/spa/src/api/src/Upload.ts
index 173849c..bd6e735 100644
--- a/VoidCat/spa/src/api/src/Upload.ts
+++ b/VoidCat/spa/src/api/src/Upload.ts
@@ -1,7 +1,7 @@
-import {VoidUploadResult} from "./index";
+import { VoidUploadResult } from "./index";
 import sjcl from "sjcl";
-import {sjclcodec} from "./codecBytes";
-import {buf2hex} from "./Util";
+import { sjclcodec } from "./codecBytes";
+import { buf2hex } from "./utils";
 /**
  * Generic upload state
  */
diff --git a/VoidCat/spa/src/api/src/codecBytes.js b/VoidCat/spa/src/api/src/codecBytes.js
index 48c026b..918de3b 100644
--- a/VoidCat/spa/src/api/src/codecBytes.js
+++ b/VoidCat/spa/src/api/src/codecBytes.js
@@ -14,9 +14,9 @@ export const sjclcodec = {
     /** Convert from a bitArray to an array of bytes. */
     fromBits: function (arr) {
         var out = [], bl = sjcl.bitArray.bitLength(arr), i, tmp;
-        for (i=0; i<bl/8; i++) {
-            if ((i&3) === 0) {
-                tmp = arr[i/4];
+        for (i = 0; i < bl / 8; i++) {
+            if ((i & 3) === 0) {
+                tmp = arr[i / 4];
             }
             out.push(tmp >>> 24);
             tmp <<= 8;
@@ -26,16 +26,16 @@ export const sjclcodec = {
     /** Convert from an array of bytes to a bitArray. */
     /** @return {bitArray} */
     toBits: function (bytes) {
-        var out = [], i, tmp=0;
-        for (i=0; i<bytes.length; i++) {
+        var out = [], i, tmp = 0;
+        for (i = 0; i < bytes.length; i++) {
             tmp = tmp << 8 | bytes[i];
-            if ((i&3) === 3) {
+            if ((i & 3) === 3) {
                 out.push(tmp);
                 tmp = 0;
             }
         }
-        if (i&3) {
-            out.push(sjcl.bitArray.partial(8*(i&3), tmp));
+        if (i & 3) {
+            out.push(sjcl.bitArray.partial(8 * (i & 3), tmp));
         }
         return out;
     }
diff --git a/VoidCat/spa/src/api/src/index.ts b/VoidCat/spa/src/api/src/index.ts
index 2cf0428..ee1346c 100644
--- a/VoidCat/spa/src/api/src/index.ts
+++ b/VoidCat/spa/src/api/src/index.ts
@@ -1,6 +1,6 @@
-export {VoidApi} from "./Api"
-export {UploadState} from "./Upload";
-export {StreamEncryption} from "./StreamEncryption";
+export { VoidApi } from "./api"
+export { UploadState } from "./upload";
+export { StreamEncryption } from "./stream-encryption";
 
 export class ApiError extends Error {
     readonly statusCode: number
diff --git a/VoidCat/spa/src/api/src/StreamEncryption.ts b/VoidCat/spa/src/api/src/stream-encryption.ts
similarity index 96%
rename from VoidCat/spa/src/api/src/StreamEncryption.ts
rename to VoidCat/spa/src/api/src/stream-encryption.ts
index b999635..c021b5a 100644
--- a/VoidCat/spa/src/api/src/StreamEncryption.ts
+++ b/VoidCat/spa/src/api/src/stream-encryption.ts
@@ -1,7 +1,7 @@
-import {sjclcodec} from "./codecBytes";
-import sjcl, {SjclCipher} from "sjcl";
+import { sjclcodec } from "./codecBytes";
+import sjcl, { SjclCipher } from "sjcl";
 
-import {buf2hex} from "Util";
+import { buf2hex } from "./utils";
 
 interface EncryptionParams {
     ts: number,
diff --git a/VoidCat/spa/src/api/src/StreamUploader.ts b/VoidCat/spa/src/api/src/stream-uploader.ts
similarity index 95%
rename from VoidCat/spa/src/api/src/StreamUploader.ts
rename to VoidCat/spa/src/api/src/stream-uploader.ts
index ef0517d..5f73f1f 100644
--- a/VoidCat/spa/src/api/src/StreamUploader.ts
+++ b/VoidCat/spa/src/api/src/stream-uploader.ts
@@ -1,6 +1,6 @@
-import {UploadState, VoidUploader} from "./Upload";
-import {VoidUploadResult} from "./index";
-import {StreamEncryption} from "./StreamEncryption";
+import { UploadState, VoidUploader } from "./upload";
+import { VoidUploadResult } from "./index";
+import { StreamEncryption } from "./stream-encryption";
 
 export class StreamUploader extends VoidUploader {
     #encrypt?: StreamEncryption;
diff --git a/VoidCat/spa/src/api/src/Util.ts b/VoidCat/spa/src/api/src/utils.ts
similarity index 100%
rename from VoidCat/spa/src/api/src/Util.ts
rename to VoidCat/spa/src/api/src/utils.ts
diff --git a/VoidCat/spa/src/api/src/XHRUploader.ts b/VoidCat/spa/src/api/src/xhr-uploader.ts
similarity index 94%
rename from VoidCat/spa/src/api/src/XHRUploader.ts
rename to VoidCat/spa/src/api/src/xhr-uploader.ts
index 1e9e8d3..fdfbb28 100644
--- a/VoidCat/spa/src/api/src/XHRUploader.ts
+++ b/VoidCat/spa/src/api/src/xhr-uploader.ts
@@ -1,5 +1,5 @@
-import {UploadState, VoidUploader} from "./Upload";
-import {VoidUploadResult} from "./index";
+import { UploadState, VoidUploader } from "./upload";
+import { VoidUploadResult } from "./index";
 
 export class XHRUploader extends VoidUploader {
     canEncrypt(): boolean {
@@ -49,7 +49,7 @@ export class XHRUploader extends VoidUploader {
      * @param headers
      */
     async #xhrSegment(segment: ArrayBuffer | Blob, fullDigest: string,
-                      id?: string, editSecret?: string, part?: number, partOf?: number, headers?: HeadersInit) {
+        id?: string, editSecret?: string, part?: number, partOf?: number, headers?: HeadersInit) {
         this.onStateChange?.(UploadState.Uploading);
 
         return await new Promise<VoidUploadResult>((resolve, reject) => {