monoidentity 0.25.0 → 0.26.0

package/dist/+client.d.ts

@@ -1,9 +1,4 @@
-export * from "./_common.js";
-export { getLoginRecognized, relog, getVerification, getStorage, getScopedFS } from "./storage.js";
+export { encode, decode } from "./utils-base36.js";
+export { getLoginRecognized, relog, getStorage, getScopedFS, VERIFICATION_PATH, } from "./storage.js";
 export type { SyncStrategy } from "./client.js";
-export { waitForSync } from "./storage/utils-sync.js";
-export { retrieveVerification } from "./verification-client.js";
-export { attest as rawAttest } from "./verification/attest.js";
-export { readyUp } from "./readyup.js";
-export { default as Monoidentity } from "./Monoidentity.svelte";
 export type { Bucket, StorageSetup } from "./utils-transport.js";

package/dist/+client.js

@@ -1,7 +1,4 @@
-export * from "./_common.js";
-export { getLoginRecognized, relog, getVerification, getStorage, getScopedFS } from "./storage.js";
-export { waitForSync } from "./storage/utils-sync.js";
-export { retrieveVerification } from "./verification-client.js";
-export { attest as rawAttest } from "./verification/attest.js";
-export { readyUp } from "./readyup.js";
-export { default as Monoidentity } from "./Monoidentity.svelte";
+// common
+export { encode, decode } from "./utils-base36.js";
+// storage
+export { getLoginRecognized, relog, getStorage, getScopedFS, VERIFICATION_PATH, } from "./storage.js";

package/dist/old/storage/utils-sync.d.ts

@@ -0,0 +1,13 @@
+export type SyncRequestDetail = {
+    key: string;
+    resolve?: () => void;
+    reject?: (reason?: unknown) => void;
+};
+declare global {
+    interface WindowEventMap {
+        "monoidentity-sync-request": CustomEvent<SyncRequestDetail>;
+    }
+}
+export declare const SYNC_REQUEST_EVENT = "monoidentity-sync-request";
+export declare const addSync: (key: string, promise: Promise<void>) => void;
+export declare const scheduleSync: (key: string, fn: () => Promise<void>, delay?: number) => void;

package/dist/{storage → old/storage}/utils-sync.js

@@ -1,3 +1,4 @@
+export const SYNC_REQUEST_EVENT = "monoidentity-sync-request";
 const activeSyncs = {};
 const scheduledSyncs = {};
 export const addSync = (key, promise) => {
@@ -23,14 +24,9 @@ const scheduleInterval = setInterval(() => {
         }
     }
 }, 100);
-if (import.meta.hot) {
-    import.meta.hot.dispose(() => {
-        clearInterval(scheduleInterval);
-    });
-}
-export const waitForSync = async (key) => {
+const waitForTrackedSync = async (key) => {
     if (key != "*") {
-        await waitForSync("*");
+        await waitForTrackedSync("*");
     }
     if (key in activeSyncs) {
         await activeSyncs[key];
@@ -43,3 +39,20 @@ export const scheduleSync = (key, fn, delay = 1000) => {
     const executeAt = Date.now() + delay;
     scheduledSyncs[key] = { fn, executeAt };
 };
+const onSyncRequest = (event) => {
+    const { key, resolve, reject } = event.detail;
+    waitForTrackedSync(key)
+        .then(() => {
+        resolve?.();
+    })
+        .catch((error) => {
+        reject?.(error);
+    });
+};
+addEventListener(SYNC_REQUEST_EVENT, onSyncRequest);
+if (import.meta.hot) {
+    import.meta.hot.dispose(() => {
+        clearInterval(scheduleInterval);
+        removeEventListener(SYNC_REQUEST_EVENT, onSyncRequest);
+    });
+}

package/dist/storage.d.ts

@@ -4,7 +4,6 @@ export declare const getLoginRecognized: () => {
 };
 export declare const setLoginRecognized: (login: string) => void;
 export declare const relog: () => never;
-export declare const getVerification: () => Promise<any>;
-export declare const setVerification: (jwt: string) => void;
+export declare const VERIFICATION_PATH = ".local/verification.jwt";
 export declare const getStorage: (realm: "config" | "userdata" | "cache" | (string & {})) => Record<string, any>;
 export declare const getScopedFS: (dir: string) => Record<string, any>;

package/dist/storage.js

@@ -2,9 +2,7 @@ import { stringify, parse } from "devalue";
 import { parse as useSchema } from "valibot";
 import { decode } from "./utils-base36.js";
 import { login as loginSchema } from "./utils-transport.js";
-import { verify } from "@tsndr/cloudflare-worker-jwt";
-import publicKey from "./verification/public-key.js";
-import { storageClient } from "./storage/storageclient.svelte.js";
+import { storageClient } from "./storageclient.svelte.js";
 import { switchToHub } from "./utils-hub.js";
 const LOGIN_RECOGNIZED_PATH = ".local/login.encjson";
 export const getLoginRecognized = () => {
@@ -21,19 +19,7 @@ export const setLoginRecognized = (login) => {
 export const relog = () => {
     switchToHub([{ loginRecognized: true }]);
 };
-const VERIFICATION_PATH = ".local/verification.jwt";
-export const getVerification = async () => {
-    const client = storageClient();
-    const jwt = client[VERIFICATION_PATH];
-    if (!jwt)
-        throw new Error("No verification found");
-    await verify(jwt, publicKey, { algorithm: "ES256", throwError: true });
-    return jwt;
-};
-export const setVerification = (jwt) => {
-    const client = storageClient();
-    client[VERIFICATION_PATH] = jwt;
-};
+export const VERIFICATION_PATH = ".local/verification.jwt";
 export const getStorage = (realm) => {
     const prefix = `.${realm}/${MONOIDENTITY_APP_ID}/`;
     return storageClient((key) => `${prefix}${key}.devalue`, (key) => (key.startsWith(prefix) ? key.slice(prefix.length, -".devalue".length) : undefined), stringify, parse);

package/dist/{storage/storageclient.svelte.d.ts → storageclient.svelte.d.ts}

@@ -1,3 +1,4 @@
+export declare const waitForSync: (key: string) => Promise<void>;
 declare global {
     interface WindowEventMap {
         "monoidentity-storage": CustomEvent<{

package/dist/{storage/storageclient.svelte.js → storageclient.svelte.js}

@@ -1,4 +1,7 @@
-import { waitForSync } from "./utils-sync.js";
+import { SYNC_REQUEST_EVENT } from "./old/storage/utils-sync.js";
+export const waitForSync = async (key) => {
+    await new Promise((resolve, reject) => window.dispatchEvent(new CustomEvent(SYNC_REQUEST_EVENT, { detail: { key, resolve, reject } })));
+};
 export const STORAGE_EVENT = "monoidentity-storage";
 const announce = (key, value) => {
     // Announce to all, even third parties

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monoidentity",
-  "version": "0.25.0",
+  "version": "0.26.0",
   "license": "ISC",
   "repository": "KTibow/monoidentity",
   "author": {
@@ -25,20 +25,14 @@
     "./init": {
       "types": "./dist/+init.d.ts",
       "import": "./dist/+init.js"
-    },
-    "./server": {
-      "types": "./dist/+server.d.ts",
-      "import": "./dist/+server.js"
     }
   },
   "peerDependencies": {
     "svelte": "^5.0.0"
   },
   "dependencies": {
-    "@tsndr/cloudflare-worker-jwt": "^3.2.1",
     "aws4fetch": "^1.0.20",
     "devalue": "^5.6.2",
-    "fast-studentvue": "^2.1.1",
     "idb-keyval": "^6.2.2",
     "valibot": "^1.2.0"
   },
@@ -51,7 +45,6 @@
     "monoserve": "^3.2.4",
     "publint": "^0.3.17",
     "rolldown": "1.0.0-rc.4",
-    "school-districts": "^5.0.1",
     "svelte": "^5.51.0",
     "svelte-check": "^4.4.0",
     "tinyglobby": "^0.2.15",

package/dist/+server.d.ts

@@ -1,2 +0,0 @@
-export * from "./_common.js";
-export { useVerification } from "./verification-server.js";

package/dist/+server.js

@@ -1,2 +0,0 @@
-export * from "./_common.js";
-export { useVerification } from "./verification-server.js";

package/dist/Monoidentity.svelte

@@ -1,86 +0,0 @@
-<script lang="ts">
-  import { onDestroy, type Snippet } from "svelte";
-  import { readyUp } from "./readyup.js";
-  import type { Intent } from "./utils-transport.js";
-
-  let {
-    intents,
-    children,
-  }: {
-    intents?: Intent[];
-    children: Snippet;
-  } = $props();
-
-  const aborter = new AbortController();
-  onDestroy(() => {
-    aborter.abort();
-  });
-
-  let backup: (() => void) | undefined = $state();
-  readyUp(
-    intents || [],
-    aborter.signal,
-    (startBackup) =>
-      (backup = () => {
-        startBackup();
-        backup = undefined;
-      }),
-  );
-</script>
-
-{#snippet backupUI(yes: () => void, no: () => void)}
-  <p>Avoid reconfiguration with a backup folder.</p>
-  <button onclick={no}>Skip</button>
-  <button class="primary" onclick={yes}>Connect</button>
-{/snippet}
-
-{@render children()}
-{#if backup}
-  <div class="backup toast">
-    {@render backupUI(backup, () => (backup = undefined))}
-  </div>
-{/if}
-
-<style>
-  .backup {
-    display: flex;
-    flex-direction: column;
-    gap: 0.25rem;
-    line-height: 1;
-
-    > * {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 3rem;
-      margin: 0;
-      padding-inline: 0.5rem;
-      border-radius: 0.5rem;
-      border: none;
-      font: inherit;
-      &:first-child {
-        border-start-start-radius: 1.5rem;
-        border-start-end-radius: 1.5rem;
-      }
-      &:last-child {
-        border-end-start-radius: 1.5rem;
-        border-end-end-radius: 1.5rem;
-      }
-      background-color: light-dark(#fff, #000);
-      color: light-dark(#000, #fff);
-    }
-    > button {
-      cursor: pointer;
-    }
-    > .primary {
-      background-color: light-dark(#000, #fff);
-      color: light-dark(#fff, #000);
-    }
-  }
-  .toast {
-    position: fixed;
-    right: 1rem;
-    top: 1rem;
-    z-index: 1000;
-  }
-</style>

package/dist/Monoidentity.svelte.d.ts

@@ -1,9 +0,0 @@
-import { type Snippet } from "svelte";
-import type { Intent } from "./utils-transport.js";
-type $$ComponentProps = {
-    intents?: Intent[];
-    children: Snippet;
-};
-declare const Monoidentity: import("svelte").Component<$$ComponentProps, {}, "">;
-type Monoidentity = ReturnType<typeof Monoidentity>;
-export default Monoidentity;

package/dist/_common.d.ts

@@ -1 +0,0 @@
-export { encode, decode } from "./utils-base36.js";

package/dist/_common.js

@@ -1 +0,0 @@
-export { encode, decode } from "./utils-base36.js";

package/dist/readyup.d.ts

@@ -1,2 +0,0 @@
-import { type Intent } from "./utils-transport.js";
-export declare const readyUp: (intents: Intent[], signal: AbortSignal, requestBackup: (startBackup: () => void) => void) => void;

package/dist/readyup.js

@@ -1,62 +0,0 @@
-import {} from "./utils-transport.js";
-// import { createLocalStorage } from "./storage/createlocalstorage.js";
-// import { wrapBackup } from "./storage/wrapbackup.js";
-// import { wrapCloud } from "./storage/wrapcloud.js";
-import { setLoginRecognized } from "./storage.js";
-import { pullFromLocalBackup } from "./storage/backuplocally-pull.js";
-import { mountLocalBackupPush } from "./storage/backuplocally-push.js";
-import { createCloudClient } from "./storage/backupcloud-connection.js";
-import { mountCloudPull, pullFromCloud } from "./storage/backupcloud-pull.js";
-import { mountCloudPush } from "./storage/backupcloud-push.js";
-import { switchToHub } from "./utils-hub.js";
-export const readyUp = (intents, signal, requestBackup) => {
-    let setup = localStorage["monoidentity-x/setup"]
-        ? JSON.parse(localStorage["monoidentity-x/setup"])
-        : undefined;
-    let provisions = [];
-    const params = new URLSearchParams(location.hash.slice(1));
-    const cb = params.get("monoidentitycallback");
-    if (cb) {
-        history.replaceState(null, "", location.pathname);
-        ({ provisions } = JSON.parse(cb));
-    }
-    for (const provision of provisions) {
-        if ("setup" in provision) {
-            setup = provision.setup;
-            localStorage["monoidentity-x/setup"] = JSON.stringify(setup);
-        }
-    }
-    if (!setup) {
-        switchToHub([{ storage: true }, ...intents]);
-    }
-    for (const provision of provisions) {
-        if ("createLoginRecognized" in provision) {
-            setLoginRecognized(provision.createLoginRecognized);
-        }
-    }
-    // fire off backup
-    if (setup.method == "localStorage") {
-        void pullFromLocalBackup(requestBackup)
-            .then((dir) => {
-            signal.throwIfAborted();
-            if (!dir)
-                return;
-            mountLocalBackupPush(dir, signal);
-        })
-            .catch((err) => {
-            console.error("[monoidentity local] pull failed", err);
-        });
-    }
-    if (setup.method == "cloud") {
-        const client = createCloudClient(setup);
-        void pullFromCloud(client)
-            .then(() => {
-            signal.throwIfAborted();
-            mountCloudPull(client, signal);
-            mountCloudPush(client, signal);
-        })
-            .catch((err) => {
-            console.error("[monoidentity cloud] pull failed", err);
-        });
-    }
-};

package/dist/storage/utils-sync.d.ts

@@ -1,3 +0,0 @@
-export declare const addSync: (key: string, promise: Promise<void>) => void;
-export declare const waitForSync: (key: string) => Promise<void>;
-export declare const scheduleSync: (key: string, fn: () => Promise<void>, delay?: number) => void;

package/dist/verification/attest.d.ts

@@ -1 +0,0 @@
-export declare const attest: (email: string, password: string) => Promise<any>;

package/dist/verification/attest.js

@@ -1,6 +0,0 @@
-import { generateStudentVueToken } from "./studentvue-client.js";
-import useStudentVue from "./use-studentvue-remote.js";
-export const attest = async (email, password) => {
-    const token = await generateStudentVueToken(email, password);
-    return await useStudentVue({ token, email });
-};

package/dist/verification/gen.sh

@@ -1,2 +0,0 @@
-openssl ecparam -genkey -name prime256v1 -noout | openssl pkcs8 -topk8 -nocrypt -out private.pem
-openssl ec -in private.pem -pubout -out public.pem

package/dist/verification/jwt-utils.d.ts

@@ -1 +0,0 @@
-export declare const generateVerificationJWT: (email: string, method: string) => Promise<string>;

package/dist/verification/jwt-utils.js

@@ -1,9 +0,0 @@
-import { sign } from "@tsndr/cloudflare-worker-jwt";
-import { VERIFICATION_PRIVATE_KEY } from "$env/static/private";
-export const generateVerificationJWT = async (email, method) => {
-    return await sign({
-        sub: email,
-        verification: { method },
-        exp: Math.floor(Date.now() / 1000) + 24 * 3600 * 365,
-    }, VERIFICATION_PRIVATE_KEY, { algorithm: "ES256" });
-};

package/dist/verification/public-key.d.ts

@@ -1,2 +0,0 @@
-declare const _default: "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAERXBMZBkx95Iua82tR9gsmdegOwuB\nOGgbkB6h9s4DROhBRkpubcAiu5Qa9GizbWk1g0RwrnrdVo7yxENcEs2+zw==\n-----END PUBLIC KEY-----\n";
-export default _default;

package/dist/verification/public-key.js

@@ -1,5 +0,0 @@
-export default `-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAERXBMZBkx95Iua82tR9gsmdegOwuB
-OGgbkB6h9s4DROhBRkpubcAiu5Qa9GizbWk1g0RwrnrdVo7yxENcEs2+zw==
------END PUBLIC KEY-----
-`;

package/dist/verification/studentvue-client.d.ts

@@ -1 +0,0 @@
-export declare const generateStudentVueToken: (email: string, password: string) => Promise<any>;

package/dist/verification/studentvue-client.js

@@ -1,24 +0,0 @@
-import { districtApps } from "school-districts";
-import fastStudentvue from "fast-studentvue";
-const studentvue = (email, password, methodName, params = {}) => fastStudentvue({ email, password }, () => {
-    throw new Error("Invalid auth");
-}, methodName, params);
-export const generateStudentVueToken = async (email, password) => {
-    const domain = email.split("@")[1];
-    const apps = districtApps[domain];
-    if (!apps) {
-        throw new Error("Unknown domain");
-    }
-    const svApp = apps.find((app) => app.app == "StudentVue");
-    if (!svApp) {
-        throw new Error("Domain does not support StudentVue");
-    }
-    const response = await studentvue(email, password, "GenerateAuthToken", {
-        Username: "",
-        TokenForClassWebSite: "true",
-        DocumentID: "1",
-        AssignmentID: "1",
-    });
-    const token = response.AuthToken["@_EncyToken"];
-    return token;
-};

package/dist/verification/use-studentvue-remote.d.ts

@@ -1,2 +0,0 @@
-export { use_studentvue_remote_default as default };
-declare function use_studentvue_remote_default(arg: any, init: any): Promise<any>;

package/dist/verification/use-studentvue-remote.js

@@ -1,15 +0,0 @@
-import "devalue";
-
-//#region src/lib/verification/use-studentvue.remote.ts
-async function use_studentvue_remote_default(arg, init) {
-	const res = await fetch("https://monoserve-by45xe47vq-uc.a.run.app/use-studentvue:d6da", {
-		method: "POST",
-		body: JSON.stringify(arg),
-		...init
-	});
-	if (!res.ok) throw new Error(await res.text());
-	return await res.json();
-}
-
-//#endregion
-export { use_studentvue_remote_default as default };

package/dist/verification-client.d.ts

@@ -1 +0,0 @@
-export declare const retrieveVerification: () => Promise<any>;

package/dist/verification-client.js

@@ -1,14 +0,0 @@
-import { attest } from "./verification/attest.js";
-import { getLoginRecognized, getVerification, setVerification } from "./storage.js";
-export const retrieveVerification = async () => {
-    let jwt;
-    try {
-        jwt = await getVerification();
-    }
-    catch {
-        const { email, password } = getLoginRecognized();
-        jwt = await attest(email, password);
-        setVerification(jwt);
-    }
-    return jwt;
-};

package/dist/verification-server.d.ts

@@ -1 +0,0 @@
-export declare const useVerification: (jwt: string) => Promise<import("@tsndr/cloudflare-worker-jwt").JwtData<{}, {}>>;

package/dist/verification-server.js

@@ -1,6 +0,0 @@
-import { verify } from "@tsndr/cloudflare-worker-jwt";
-import publicKey from "./verification/public-key.js";
-export const useVerification = async (jwt) => {
-    const result = await verify(jwt, publicKey, { algorithm: "ES256", throwError: true });
-    return result;
-};