v1 Release

* Fixed configuration order of operations & updated version
* Added build instructions to README
* Bumped deps
* Formatting fixes

Author: bendews

README.md

@@ -99,6 +99,41 @@ Commands:
 
 <!-- CONTRIBUTING -->
 
+## Building
+
+This project uses Deno for development and compilation. Make sure you have Deno
+installed on your system before proceeding.
+
+### Running the Project
+
+To run the project whilst developing:
+
+```
+deno run --allow-env --allow-read --allow-write --allow-net src/cli.ts <OPTIONS>
+```
+
+You can specify the desired Deno permissions flags to limit the functionality of
+the CLI. To disable the Deno permissions system, use `-A` (allow-all) instead:
+
+```
+deno run -A src/cli.ts
+```
+
+### Building a release version
+
+To build a statically compiled binary:
+
+```
+deno compile --allow-env --allow-read --allow-write --allow-net -o apw src/cli.ts
+```
+
+You can specify the desired Deno permissions flags to limit the functionality of
+the CLI. To disable the Deno permissions system, use `-A` (allow-all) instead:
+
+```
+deno compile -A -o apw src/cli.ts
+```
+
 ## Contributing
 
 Contributions are what make the open source community such an amazing place to

deno.json

@@ -1 +1,6 @@
-{}
+{
+  "imports": {
+    "@cliffy/command": "jsr:@cliffy/command@^1.0.0-rc.7",
+    "@cliffy/prompt": "jsr:@cliffy/prompt@^1.0.0-rc.7"
+  }
+}

deno.lock

@@ -7,7 +7,7 @@ import {
   type RenamedPasswordEntry,
   type TOTPEntry,
 } from "./types.ts";
-import { APWError, Status } from "./const.ts";
+import { APWError, Status, VERSION } from "./const.ts";
 
 const PrintEntries = (payload: Payload) => {
   if (payload.STATUS !== Status.SUCCESS) {
@@ -159,7 +159,7 @@ const auth = new Command()
 try {
   await new Command()
     .name("apw-cli")
-    .version("0.1.0")
+    .version(`v${VERSION}`)
     .description("🔑 a CLI for Apple Passwords 🔒")
     .command("auth", auth)
     .command("pw", pw)

src/cli.ts

@@ -10,6 +10,7 @@ import {
 import { SRPSession } from "./srp.ts";
 import { readBigInt, readConfig, toBase64, toBuffer } from "./utils.ts";
 import { type Message, type SMSG } from "./types.ts";
+import { writeConfig } from "./utils.ts";
 
 const BROWSER_NAME = "Arc";
 const VERSION = "1.0";
@@ -179,6 +180,7 @@ export class ApplePasswordManager {
 
   constructor() {
     this.session = SRPSession.new(true);
+    writeConfig({});
     const { username, sharedKey, port } = readConfig();
     this.remotePort = port;
     if (typeof sharedKey !== "bigint") return;
@@ -276,7 +278,7 @@ export class ApplePasswordManager {
   }
 
   async verifyChallenge(password: string) {
-    await this.session.setSharedKey(password);
+    const newKey = await this.session.setSharedKey(password);
 
     const m = await this.session.computeM();
     const msg = await APWMessages.verifyChallenge(this.session, m);
@@ -327,6 +329,11 @@ export class ApplePasswordManager {
         "Invalid server verification: HAMK mismatch",
       );
     }
+    console.log("Challenge verified, updating config");
+    await writeConfig({
+      username: this.session.username.toString(),
+      sharedKey: newKey,
+    });
   }
 
   async getLoginNamesForURL(url: string) {

src/client.ts

@@ -1,5 +1,7 @@
 export const DATA_PATH = `${Deno.env.get("HOME")}/.apw`;
 
+export const VERSION = "1.0.0";
+
 export class APWError extends Error {
   code: Status;
   constructor(public status: Status, message?: string) {

src/const.ts

@@ -1,8 +1,5 @@
-export { Command } from "https://deno.land/x/cliffy@v1.0.0-rc.3/command/mod.ts";
-export {
-  Input,
-  Select,
-} from "https://deno.land/x/cliffy@v1.0.0-rc.3/prompt/mod.ts";
+export { Command } from "@cliffy/command";
+export { Input, Select } from "@cliffy/prompt";
 export { Buffer } from "node:buffer";
 export { createSocket, type RemoteInfo } from "node:dgram";
 export { existsSync } from "node:fs";

src/deps.ts

@@ -7,7 +7,6 @@ import {
   readBigInt,
   sha256,
   toBuffer,
-  writeConfig,
 } from "./utils.ts";
 import { APWError, Status } from "./const.ts";
 import { SRPValues } from "./types.ts";
@@ -162,10 +161,6 @@ export class SRPSession {
     );
 
     this.sharedKey = readBigInt(await sha256(premasterSecret));
-    await writeConfig({
-      username: this.username.toString(),
-      sharedKey: this.sharedKey,
-    });
     return this.sharedKey;
   }
 

src/srp.ts

@@ -79,18 +79,18 @@ export const clearConfig = async () => {
   }
 };
 
-export const writeConfig = async (
+export const writeConfig = (
   { username, sharedKey, port }: {
     username?: string;
     sharedKey?: bigint;
     port?: number;
   },
 ) => {
   let existingConfig: APWConfig;
-  await Deno.mkdir(DATA_PATH, { recursive: true });
+  Deno.mkdirSync(DATA_PATH, { recursive: true });
   try {
     existingConfig = JSON.parse(
-      await Deno.readTextFile(`${DATA_PATH}/config.json`),
+      Deno.readTextFileSync(`${DATA_PATH}/config.json`),
     );
   } catch (_) {
     existingConfig = { sharedKey: "", username: "" };
@@ -101,7 +101,7 @@ export const writeConfig = async (
     sharedKey: sharedKey ? toBase64(sharedKey) : existingConfig.sharedKey,
     port: port || existingConfig.port || 10000,
   };
-  await Deno.writeTextFile(
+  Deno.writeTextFileSync(
     `${DATA_PATH}/config.json`,
     JSON.stringify(updatedConfig),
   );