Chelonia in SW

frontend/controller/actions/chatroom.js

@@ -21,6 +21,7 @@ sbp('okTurtles.events/on', MESSAGE_RECEIVE_RAW, ({
   // If newMessage is undefined, it means that an existing message is being edited
   newMessage
 }) => {
+  const state = sbp('chelonia/contract/state', contractID)
   const getters = sbp('state/vuex/getters')
   const mentions = makeMentionFromUserID(getters.ourIdentityContractId)
   const msgData = newMessage || data
@@ -42,10 +43,10 @@ sbp('okTurtles.events/on', MESSAGE_RECEIVE_RAW, ({
     messageHash: msgData.hash,
     height: msgData.height,
     text: msgData.text,
-    isDMOrMention: isMentionedMe || getters.chatRoomAttributes.type === CHATROOM_TYPES.DIRECT_MESSAGE,
+    isDMOrMention: isMentionedMe || state.attributes?.type === CHATROOM_TYPES.DIRECT_MESSAGE,
     messageType: !newMessage ? MESSAGE_TYPES.TEXT : data.type,
     memberID: innerSigningContractID,
-    chatRoomName: getters.chatRoomAttributes.name
+    chatRoomName: state.attributes?.name
   }).catch(e => {
     console.error('[action/chatroom.js] Error on messageReceivePostEffect', e)
   })

frontend/controller/actions/group.js

@@ -860,8 +860,8 @@ export default (sbp('sbp/selectors/register', {
       // inside of the exception handler :-(
     }
   },
-  'gi.actions/group/notifyProposalStateInGeneralChatRoom': function ({ groupID, proposal }: { groupID: string, proposal: Object }) {
-    const { generalChatRoomId } = sbp('chelonia/rootState')[groupID]
+  'gi.actions/group/notifyProposalStateInGeneralChatRoom': async function ({ groupID, proposal }: { groupID: string, proposal: Object }) {
+    const { generalChatRoomId } = await sbp('chelonia/contract/state', groupID)
     return sbp('gi.actions/chatroom/addMessage', {
       contractID: generalChatRoomId,
       data: { type: MESSAGE_TYPES.INTERACTIVE, proposal }

frontend/controller/actions/identity-kv.js

@@ -1,7 +1,7 @@
 'use strict'
 import sbp from '@sbp/sbp'
 import { KV_KEYS } from '~/frontend/utils/constants.js'
-import { KV_QUEUE, ONLINE } from '~/frontend/utils/events.js'
+import { KV_QUEUE, NEW_PREFERENCES, NEW_UNREAD_MESSAGES, ONLINE } from '~/frontend/utils/events.js'
 import { isExpired } from '@model/notifications/utils.js'
 
 const initNotificationStatus = (data = {}) => ({ ...data, read: false })
@@ -51,8 +51,7 @@ export default (sbp('sbp/selectors/register', {
   'gi.actions/identity/kv/loadChatRoomUnreadMessages': () => {
     return sbp('okTurtles.eventQueue/queueEvent', KV_QUEUE, async () => {
       const currentChatRoomUnreadMessages = await sbp('gi.actions/identity/kv/fetchChatRoomUnreadMessages')
-      // TODO: Can't use state/vuex/commit
-      sbp('state/vuex/commit', 'setUnreadMessages', currentChatRoomUnreadMessages)
+      sbp('okTurtles.events/emit', NEW_UNREAD_MESSAGES, currentChatRoomUnreadMessages)
     })
   },
   'gi.actions/identity/kv/initChatRoomUnreadMessages': ({ contractID, messageHash, createdHeight }: {
@@ -192,8 +191,7 @@ export default (sbp('sbp/selectors/register', {
   'gi.actions/identity/kv/loadPreferences': () => {
     return sbp('okTurtles.eventQueue/queueEvent', KV_QUEUE, async () => {
       const preferences = await sbp('gi.actions/identity/kv/fetchPreferences')
-      // TODO: Can't use state/vuex/commit
-      sbp('state/vuex/commit', 'setPreferences', preferences)
+      sbp('okTurtles.events/emit', NEW_PREFERENCES, preferences)
     })
   },
   'gi.actions/identity/kv/updateDistributionBannerVisibility': ({ contractID, hidden }: { contractID: string, hidden: boolean }) => {

frontend/controller/actions/identity.js

@@ -497,9 +497,7 @@ export default (sbp('sbp/selectors/register', {
     const partnerIDs = params.data.memberIDs
       .filter(memberID => memberID !== rootGetters.ourIdentityContractId)
       .map(memberID => rootGetters.ourContactProfilesById[memberID].contractID)
-    // NOTE: 'rootState.currentGroupId' could be changed while waiting for the sbp functions to be proceeded
-    //       So should save it as a constant variable 'currentGroupId', and use it which can't be changed
-    const currentGroupId = rootState.currentGroupId
+    const currentGroupId = params.currentGroupId
 
     const message = await sbp('gi.actions/chatroom/create', {
       data: {

frontend/controller/app/identity.js

@@ -4,7 +4,7 @@ import { GIErrorUIRuntimeError, L, LError, LTags } from '@common/common.js'
 import { cloneDeep } from '@model/contracts/shared/giLodash.js'
 import sbp from '@sbp/sbp'
 import Vue from 'vue'
-import { LOGIN, LOGIN_COMPLETE, LOGIN_ERROR } from '~/frontend/utils/events.js'
+import { LOGIN, LOGIN_COMPLETE, LOGIN_ERROR, NEW_PREFERENCES, NEW_UNREAD_MESSAGES } from '~/frontend/utils/events.js'
 import { Secret } from '~/shared/domains/chelonia/Secret.js'
 import { boxKeyPair, buildRegisterSaltRequest, computeCAndHc, decryptContractSalt, hash, hashPassword, randomNonce } from '~/shared/zkpp.js'
 // Using relative path to crypto.js instead of ~-path to workaround some esbuild bug
@@ -147,6 +147,14 @@ sbp('okTurtles.events/on', LOGIN, async ({ identityContractID, encryptionParams,
   }
 })
 
+sbp('okTurtles.events/on', NEW_PREFERENCES, (currentChatRoomUnreadMessages) => {
+  sbp('state/vuex/commit', 'setUnreadMessages', currentChatRoomUnreadMessages)
+})
+
+sbp('okTurtles.events/on', NEW_UNREAD_MESSAGES, (preferences) => {
+  sbp('state/vuex/commit', 'setPreferences', preferences)
+})
+
 /* Commented out as persistentActions are not being used
 sbp('okTurtles.events/on', LOGOUT, (a) => {
   // TODO: [SW] It may make more sense to load persistent actions in
@@ -223,6 +231,7 @@ export default (sbp('sbp/selectors/register', {
 
       return userID
     } catch (e) {
+      console.error('@@@gi.app/identity/create failed!', e.message, e.stack)
       console.error('gi.app/identity/create failed!', e)
       throw new GIErrorUIRuntimeError(L('Failed to create user identity: {reportError}', LError(e)))
     }

frontend/controller/namespace.js

@@ -1,17 +1,16 @@
 'use strict'
 
 import sbp from '@sbp/sbp'
-import Vue from 'vue'
 
 // NOTE: prefix groups with `group/` and users with `user/` ?
 sbp('sbp/selectors/register', {
   'namespace/lookupCached': (name: string) => {
     const cache = sbp('state/vuex/state').namespaceLookups
-    return cache[name] ?? null
+    return cache?.[name] ?? null
   },
   'namespace/lookupReverseCached': (id: string) => {
     const cache = sbp('state/vuex/state').reverseNamespaceLookups
-    return cache[id] ?? null
+    return cache?.[id] ?? null
   },
   'namespace/lookup': (name: string, { skipCache }: { skipCache: boolean } = { skipCache: false }) => {
     if (!skipCache) {
@@ -23,23 +22,6 @@ sbp('sbp/selectors/register', {
         return Promise.resolve(cached)
       }
     }
-    return fetch(`${sbp('okTurtles.data/get', 'API_URL')}/name/${encodeURIComponent(name)}`).then((r: Object) => {
-      if (!r.ok) {
-        console.warn(`namespace/lookup: ${r.status} for ${name}`)
-        if (r.status !== 404) {
-          throw new Error(`${r.status}: ${r.statusText}`)
-        }
-        return null
-      }
-      return r['text']()
-    }).then(value => {
-      if (value !== null) {
-        const cache = sbp('state/vuex/state').namespaceLookups
-        const reverseCache = sbp('state/vuex/state').reverseNamespaceLookups
-        Vue.set(cache, name, value)
-        Vue.set(reverseCache, value, name)
-      }
-      return value
-    })
+    return sbp('sw-namespace/lookup', name, { skipCache })
   }
 })

frontend/controller/service-worker.js

@@ -1,10 +1,11 @@
 'use strict'
 
-import sbp from '@sbp/sbp'
 import { PUBSUB_INSTANCE } from '@controller/instance-keys.js'
-import { REQUEST_TYPE, PUSH_SERVER_ACTION_TYPE, PUBSUB_RECONNECTION_SUCCEEDED, createMessage } from '~/shared/pubsub.js'
-import { HOURS_MILLIS } from '~/frontend/model/contracts/shared/time.js'
+import sbp from '@sbp/sbp'
 import { PWA_INSTALLABLE } from '@utils/events.js'
+import { HOURS_MILLIS } from '~/frontend/model/contracts/shared/time.js'
+import { PUBSUB_RECONNECTION_SUCCEEDED, PUSH_SERVER_ACTION_TYPE, REQUEST_TYPE, createMessage } from '~/shared/pubsub.js'
+import { deserializer } from '~/shared/serdes/index.js'
 
 const pwa = {
   deferredInstallPrompt: null,
@@ -25,6 +26,7 @@ window.addEventListener('beforeinstallprompt', e => {
 
 sbp('sbp/selectors/register', {
   'service-workers/setup': async function () {
+    console.error('@@@SW SETUP')
     // setup service worker
     // TODO: move ahead with encryption stuff ignoring this service worker stuff for now
     // TODO: improve updating the sw: https://stackoverflow.com/a/49748437
@@ -82,12 +84,19 @@ sbp('sbp/selectors/register', {
               sbp('service-worker/resubscribe-push', data.subscription)
               break
             }
+            case 'event': {
+              console.error('@@@EVENT RECEIVED', event.data.subtype, ...deserializer(event.data.data))
+              sbp('okTurtles.events/emit', event.data.subtype, ...deserializer(event.data.data))
+              break
+            }
             default:
               console.error('[sw] Received unknown message type from the service worker:', data)
               break
           }
         }
       })
+
+      console.error('@@@SW DONE, returning')
     } catch (e) {
       console.error('error setting up service worker:', e)
     }
@@ -104,6 +113,8 @@ sbp('sbp/selectors/register', {
     }
 
     const pubsub = sbp('okTurtles.data/get', PUBSUB_INSTANCE)
+    if (!pubsub) return // TODO: This needs to be moved into the service worker
+    // proper. pubsub will be undefined in this context.
     const existingSubscription = await registration.pushManager.getSubscription()
     const messageToPushServerIfSocketConnected = (msgPayload) => {
       // make sure the websocket client is not in the state of CLOSING, CLOSED before sending a message.

frontend/controller/serviceworkers/sw-primary.js

@@ -1,12 +1,126 @@
 'use strict'
 
+import { PROPOSAL_ARCHIVED } from '@model/contracts/shared/constants.js'
+import '@sbp/okturtles.data'
+import '@sbp/okturtles.eventqueue'
+import '@sbp/okturtles.events'
+import sbp from '@sbp/sbp'
+import '~/frontend/controller/actions/index.js'
+import '~/frontend/controller/sw-namespace.js'
+import getters from '~/frontend/model/getters.js'
+import '~/frontend/model/notifications/selectors.js'
+import setupChelonia from '~/frontend/setupChelonia.js'
+import { LOGIN, LOGIN_ERROR, LOGOUT } from '~/frontend/utils/events.js'
+import { GIMessage } from '~/shared/domains/chelonia/GIMessage.js'
+import { Secret } from '~/shared/domains/chelonia/Secret.js'
+import { CONTRACTS_MODIFIED, CONTRACT_IS_SYNCING, EVENT_HANDLED } from '~/shared/domains/chelonia/events.js'
+import { deserializer, serializer } from '~/shared/serdes/index.js'
+import { ACCEPTED_GROUP, DELETED_CHATROOM, JOINED_CHATROOM, JOINED_GROUP, KV_EVENT, LEFT_CHATROOM, LEFT_GROUP, NAMESPACE_REGISTRATION, NEW_PREFERENCES, NEW_UNREAD_MESSAGES, NOTIFICATION_EMITTED, NOTIFICATION_REMOVED, NOTIFICATION_STATUS_LOADED, SWITCH_GROUP } from '../../utils/events.js'
+
+deserializer.register(GIMessage)
+deserializer.register(Secret)
+
 // https://serviceworke.rs/message-relay_service-worker_doc.html
 // https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API/Using_Service_Workers
 // https://jakearchibald.com/2014/using-serviceworker-today/
 // https://github.com/w3c/ServiceWorker/blob/master/explainer.md
 // https://frontendian.co/service-workers
 // https://stackoverflow.com/a/49748437 => https://medium.com/@nekrtemplar/self-destroying-serviceworker-73d62921d717 => https://love2dev.com/blog/how-to-uninstall-a-service-worker/
 
+sbp('sbp/filters/global/add', (domain, selector, data) => {
+  // if (domainBlacklist[domain] || selectorBlacklist[selector]) return
+  console.debug(`[sw] [sbp] ${selector}`, data)
+});
+
+[EVENT_HANDLED, CONTRACTS_MODIFIED, CONTRACT_IS_SYNCING, LOGIN, LOGIN_ERROR, LOGOUT, ACCEPTED_GROUP, DELETED_CHATROOM, LEFT_CHATROOM, LEFT_GROUP, JOINED_CHATROOM, JOINED_GROUP, KV_EVENT, NAMESPACE_REGISTRATION, NEW_PREFERENCES, NEW_UNREAD_MESSAGES, NOTIFICATION_EMITTED, NOTIFICATION_REMOVED, NOTIFICATION_STATUS_LOADED, SWITCH_GROUP, PROPOSAL_ARCHIVED].forEach(et => {
+  sbp('okTurtles.events/on', et, (...args) => {
+    const { data } = serializer(args)
+    const message = {
+      type: 'event',
+      subtype: et,
+      data
+    }
+    self.clients.matchAll()
+      .then((clientList) => {
+        clientList.forEach((client) => {
+          client.postMessage(message)
+        })
+      })
+  })
+})
+
+sbp('sbp/selectors/register', {
+  'state/vuex/state': () => {
+    // TODO: Remove this selector once it's removed from contracts
+    return sbp('chelonia/rootState')
+  },
+  'state/vuex/reset': () => {
+    console.error('[sw] CALLED state/vuex/reset WHICH IS UNDEFINED')
+  },
+  'state/vuex/save': () => {
+    console.error('[sw] CALLED state/vuex/save WHICH IS UNDEFINED')
+  },
+  'state/vuex/commit': () => {
+    console.error('[sw] CALLED state/vuex/commit WHICH IS UNDEFINED')
+  },
+  'state/vuex/getters': () => {
+    const obj = Object.create(null)
+    Object.defineProperties(obj, Object.fromEntries(Object.entries(getters).map(([getter, fn]) => {
+      return [getter, {
+        get: () => {
+          const state = sbp('chelonia/rootState')
+          return fn(state, obj)
+        }
+      }]
+    })))
+
+    return obj
+    /* return {
+      chatRoomUnreadMessages () {
+        return []
+      },
+      getChatroomNameById () {
+        return ''
+      },
+      groupIdFromChatRoomId () {
+        return ''
+      },
+      isGroupDirectMessage () {
+        return false
+      },
+      notificationsByGroup () {
+        return []
+      },
+      ourContactProfilesByUsername: {},
+      ourIdentityContractId: '',
+      userDisplayNameFromID () {
+        return ''
+      },
+      usernameFromID () {
+        return ''
+      },
+      ourContactProfilesById: {}
+    }
+    */
+  }
+})
+
+sbp('sbp/selectors/register', {
+  'controller/router': () => {
+    return { options: { base: '/app/' } }
+  }
+})
+
+sbp('sbp/selectors/register', {
+  'gi.ui/seriousErrorBanner': (...args) => {
+    console.error('### SERIOUS ERROR ###', ...args)
+  }
+})
+
+sbp('sbp/selectors/register', {
+  'appLogs/save': () => {}
+})
+
 self.addEventListener('install', function (event) {
   console.debug('[sw] install')
   event.waitUntil(self.skipWaiting())
@@ -16,7 +130,7 @@ self.addEventListener('activate', function (event) {
   console.debug('[sw] activate')
 
   // 'clients.claim()' reference: https://web.dev/articles/service-worker-lifecycle#clientsclaim
-  event.waitUntil(self.clients.claim())
+  event.waitUntil(setupChelonia().then(() => self.clients.claim()))
 })
 
 self.addEventListener('fetch', function (event) {
@@ -57,6 +171,17 @@ self.addEventListener('message', function (event) {
       case 'store-client-id':
         store.clientId = event.source.id
         break
+      case 'sbp': {
+        const port = event.data.port;
+        (async () => await sbp(...deserializer(event.data.data)))().then((r) => {
+          const { data, transferables } = serializer(r)
+          port.postMessage([true, data], transferables)
+        }).catch((e) => {
+          const { data, transferables } = serializer(e)
+          port.postMessage([false, data], transferables)
+        })
+        break
+      }
       case 'ping':
         event.source.postMessage({ type: 'pong' })
         break