@apollo-annotation/jbrowse-plugin-apollo 0.1.16 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apollo-annotation/jbrowse-plugin-apollo",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Apollo plugin for JBrowse 2",
   "repository": {
     "type": "git",
@@ -51,9 +51,9 @@
     "name": "Apollo"
   },
   "dependencies": {
-    "@apollo-annotation/common": "^0.1.16",
-    "@apollo-annotation/mst": "^0.1.16",
-    "@apollo-annotation/shared": "^0.1.16",
+    "@apollo-annotation/common": "^0.1.18",
+    "@apollo-annotation/mst": "^0.1.18",
+    "@apollo-annotation/shared": "^0.1.18",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@gmod/gff": "1.2.0",

package/src/ApolloInternetAccount/components/AuthTypeSelector.tsx

@@ -36,7 +36,7 @@ export const AuthTypeSelector = ({
     const controller = new AbortController()
     const { signal } = controller
     async function getAuthTypes() {
-      const uri = new URL('/auth/types', baseURL).href
+      const uri = new URL('auth/types', baseURL).href
       const response = await fetch(uri, { method: 'GET', signal })
       if (!response.ok) {
         const newErrorMessage = await createFetchErrorMessage(

package/src/ApolloInternetAccount/model.ts

@@ -288,9 +288,10 @@ const stateModelFactory = (configSchema: ApolloInternetAccountConfigModel) => {
         }
       }),
     }))
-    .volatile((self) => ({
-      socket: io(self.baseURL),
-    }))
+    .volatile((self) => {
+      const { origin, pathname: path } = new URL('socket.io/', self.baseURL)
+      return { socket: io(origin, { path }) }
+    })
     .actions((self) => ({
       addSocketListeners() {
         const { session } = getRoot<ApolloRootModel>(self)
@@ -305,7 +306,8 @@ const stateModelFactory = (configSchema: ApolloInternetAccountConfigModel) => {
         socket.on('connect', async () => {
           await self.getMissingChanges()
         })
-        socket.on('connect_error', () => {
+        socket.on('connect_error', (error) => {
+          console.error(error)
           notify('Could not connect to the Apollo server.', 'error')
         })
         socket.on('COMMON', (message: ChangeMessage | CheckResultUpdate) => {
@@ -407,7 +409,7 @@ const stateModelFactory = (configSchema: ApolloInternetAccountConfigModel) => {
         self.addSocketListeners()
         // request user locations
         const { baseURL } = self
-        const uri = new URL('/users/locations', baseURL).href
+        const uri = new URL('users/locations', baseURL).href
         const apolloFetch = self.getFetcher({
           locationType: 'UriLocation',
           uri,

package/src/components/AddAssembly.tsx

@@ -168,7 +168,7 @@ export function AddAssembly({
     const { baseURL, getFetcher, internetAccountId } = selectedInternetAccount
     if (fileType !== FileType.EXTERNAL && file) {
       // First upload file
-      const url = new URL('/files', baseURL).href
+      const url = new URL('files', baseURL).href
       const formData = new FormData()
       formData.append('file', file)
       formData.append('fileName', file.name)

package/src/components/ImportFeatures.tsx

@@ -91,7 +91,7 @@ export function ImportFeatures({
       }
 
       const { baseURL } = apolloInternetAccount
-      const uri = new URL('/features/count', baseURL)
+      const uri = new URL('features/count', baseURL)
       const searchParams = new URLSearchParams({
         assemblyId: selectedAssembly.name,
       })
@@ -158,7 +158,7 @@ export function ImportFeatures({
     const { baseURL } = apolloInternetAccount
 
     // First upload file
-    const url = new URL('/files', baseURL).href
+    const url = new URL('files', baseURL).href
     const formData = new FormData()
     formData.append('file', file)
     formData.append('fileName', file.name)

package/src/components/ManageChecks.tsx

@@ -78,7 +78,7 @@ export function ManageChecks({ handleClose, session }: ManageChecksProps) {
   useEffect(() => {
     async function getChecks() {
       const { baseURL, getFetcher } = selectedInternetAccount
-      const uri = new URL('/checks/types', baseURL).href
+      const uri = new URL('checks/types', baseURL).href
       const apolloFetch = getFetcher({ locationType: 'UriLocation', uri })
       const response = await apolloFetch(uri, { method: 'GET' })
       if (!response.ok) {
@@ -141,7 +141,7 @@ export function ManageChecks({ handleClose, session }: ManageChecksProps) {
     }
     const { notify } = session as unknown as AbstractSessionModel
     const { baseURL, getFetcher } = selectedInternetAccount
-    const uri = new URL('/assemblies/checks', baseURL).href
+    const uri = new URL('assemblies/checks', baseURL).href
     const apolloFetch = getFetcher({
       locationType: 'UriLocation',
       uri,

package/src/components/ManageUsers.tsx

@@ -71,7 +71,7 @@ export function ManageUsers({
 
   const getUsers = useCallback(async () => {
     const { baseURL } = selectedInternetAccount
-    const uri = new URL('/users', baseURL).href
+    const uri = new URL('users', baseURL).href
     const apolloFetch = selectedInternetAccount.getFetcher({
       locationType: 'UriLocation',
       uri,

package/src/components/ViewChangeLog.tsx

@@ -101,7 +101,7 @@ export function ViewChangeLog({ handleClose, session }: ViewChangeLogProps) {
 
   useEffect(() => {
     async function getAssemblies() {
-      const uri = new URL('/assemblies', baseURL).href
+      const uri = new URL('assemblies', baseURL).href
       const apolloFetch = apolloInternetAccount?.getFetcher({
         locationType: 'UriLocation',
         uri,