h1v3 0.13.0 → 0.15.0

package/README.md

@@ -194,6 +194,12 @@ export const team_membership = configureEventStore(h1v3.teamMembership.store);
 export const team_details = configureEventStore(h1v3.teamDetails.store, teamDetailsSchema);
 ```
 
+I usually put these in a file called "h1v3.config.js" and then remember to export these from my top-level index.js (as shown above):
+
+```javascript
+export * from "h1v3.config.js";
+```
+
 ### Defining schemas
 
 Schemas for the two built-in event stores user_profile and team_details expect a schema defined using a javascript prototype as shown below. Note that there is no required constraint. Instead the schema is a white-list of keys along with the expected type for the associated value.
@@ -274,6 +280,13 @@ function buildEmulated() {
 }
 ```
 
+## Database rules
+
+Once you have defined your configuration (`h1v3.config.js`) you can generate your databse.rules.json file:
+```sh
+cd functions
+npx h1v3 rules --output ../database.rules.json
+```
 
 
 

package/dist/browser/client/context.js

@@ -42,7 +42,7 @@ export async function inject({ database, authentication, metaURL, meta, handleEr
 
             const userTeamsStore = userTeamsStoreFactory({ uid });
             const userProfileStore = userProfileStoreFactory({ uid });
-            const client = user({ userTeamsStore, userProfileStore });
+            const client = user({ uid, userTeamsStore, userProfileStore, teamDetailsStoreFactory, teamMembershipStoreFactory });
             return makeDisposable(client, [userTeamsStore, userProfileStore]);
 
         },

package/dist/browser/client/team/promise.js

@@ -0,0 +1,46 @@
+export async function resolveOrTimeout(tryStrategy, pollingDelay = 300) {
+
+    let isPolling = true;
+
+    async function poll() {
+
+        while (true) {
+
+            try {
+
+                return await tryStrategy();
+
+            } catch (err) {
+
+                // polling failed - wait a bit before retrying
+                await new Promise(resolve => setTimeout(resolve, pollingDelay));
+                if (!isPolling) return undefined;
+
+            }
+
+        }
+
+    }
+
+    try {
+
+        return await Promise.race([
+            poll(),
+            timeout("Timed out waiting for creation")
+        ]);
+
+    } finally {
+
+        isPolling = false;
+
+    }
+
+
+
+}
+
+async function timeout(message, timeout = 5000) {
+
+    await new Promise((_resolve, reject) => setTimeout(() => reject(message), timeout));
+
+}

package/dist/browser/client/team/user.js

@@ -1,9 +1,15 @@
+import { rand62 } from "../id.js";
+import { resolveOrTimeout } from "./promise.js";
+
 export const DETAILS_UPDATED = "DETAILS_UPDATED";
 
-export function user({ userTeamsStore, userProfileStore }) {
+export function user({ uid, userTeamsStore, userProfileStore, teamDetailsStoreFactory, teamMembershipStoreFactory }) {
 
+    if (!uid) throw new Error("Missing uid");
     if (!userTeamsStore) throw new Error("Missing userTeamsStore");
     if (!userProfileStore) throw new Error("Missing userProfileStore");
+    if (!teamDetailsStoreFactory) throw new Error("Missing teamDetailsStoreFactory");
+    if (!teamMembershipStoreFactory) throw new Error("Missing teamMembershipStoreFactory");
 
     userTeamsStore.onProjectionValue("current", handleTeamsCurrentChanged);
 
@@ -35,6 +41,11 @@ export function user({ userTeamsStore, userProfileStore }) {
 
         },
 
+        async createTeam({ team: { id, name }, user: { displayName } = {} }, progressCallback) {
+
+            return await createTeam({ team: { id, name }, user: { displayName } }, progressCallback);
+
+        }
 
     }
 
@@ -52,12 +63,74 @@ export function user({ userTeamsStore, userProfileStore }) {
         const val = myTeamsSnap.val();
         const teams = val?.teams;
         if (!teams) return null;
-        return Object.entries(teams).map(([key, val]) => ({
-            id: key,
-            name: key,
-            since: new Date(val)
+        return await Promise.all(Object.entries(teams).map(async ([key, val]) => {
+
+            const { name } = await fetchTeamDetails(teamDetailsStoreFactory, key);
+            return {
+                id: key,
+                name,
+                since: new Date(val)
+            };
+
         }));
 
     }
 
+    async function createTeam({ team: { id, name }, user: { displayName } = {} }, progressCallback = () => {}) {
+
+        const progress = {
+            createTeam: false,
+            ensureAccess: false,
+            addToTeam: false,
+            setTeamName: false
+        }
+        const tid = id || rand62(22);
+        const teamMembershipStore = teamMembershipStoreFactory({ tid });
+        const teamDetailsStore = teamDetailsStoreFactory({ tid });
+        try {
+
+            const accessibleMembers = resolveOrTimeout(() =>
+                teamMembershipStore.getProjection("members"));
+            // create the access
+            const data = { uid };
+            if (displayName) data.name = displayName;
+            await teamMembershipStore.record("CREATED_TEAM", data);
+            progress.createTeam = true;
+            progressCallback(progress);
+
+            // wait for (admin) access
+            await accessibleMembers;
+            progress.ensureAccess = true;
+            progressCallback(progress);
+
+            // once we get access - record access...
+            await userTeamsStore.record("ADDED_TO_TEAM", { tid });
+            progress.addToTeam = true;
+            progressCallback(progress);
+
+            // ...and update team details
+            await teamDetailsStore.record("DETAILS_UPDATED", { name });
+            progress.setTeamName = true;
+            progressCallback(progress);
+
+        } finally {
+
+            teamMembershipStore.dispose();
+            teamDetailsStore.dispose();
+
+        }
+        return tid;
+
+    }
+
+}
+
+async function fetchTeamDetails(teamDetailsStoreFactory, key) {
+
+    const teamDetailsStore = teamDetailsStoreFactory({ tid: key });
+    const details = await teamDetailsStore.getProjection("current");
+    const name = details?.name || key;
+    return { name };
+
 }
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1v3",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "",
   "license": "MIT",
   "author": "",

package/src/commands/generate-rules.js

@@ -85,7 +85,11 @@ const addRulesForPath = (existingRules, [
             )
         }
         // stick the rules here
-        : rules(config);
+        : {
+            ...existingRules,
+            ...rules(config)
+        }
+        ;
 
 const parseConfig = ([_name, config]) => [
     // 0: the path

package/src/exec-eventstore.js

@@ -77,5 +77,3 @@ main({
     }
 
 });
-
-