Merge pull request #2245 from h3poteto/fix/pixelfed_ws

Fix pixelfed websocket

Author: h3poteto

example/typescript/src/pixelfed/streaming.ts

@@ -0,0 +1,49 @@
+import generator, { Entity } from 'megalodon'
+
+const BASE_URL: string = process.env.PIXELFED_URL!
+
+const access_token: string = process.env.PIXELFED_ACCESS_TOKEN!
+
+const client = generator('pixelfed', BASE_URL, access_token)
+
+client.localStreaming().then(stream => {
+  stream.on('connect', () => {
+    console.log('connect')
+  })
+
+  stream.on('pong', () => {
+    console.log('pong')
+  })
+
+  stream.on('update', (status: Entity.Status) => {
+    console.log(status)
+  })
+
+  stream.on('notification', (notification: Entity.Notification) => {
+    console.log(notification)
+  })
+
+  stream.on('delete', (id: number) => {
+    console.log(id)
+  })
+
+  stream.on('error', (err: Error) => {
+    console.error(err)
+  })
+
+  stream.on('status_update', (status: Entity.Status) => {
+    console.log('updated: ', status.url)
+  })
+
+  stream.on('heartbeat', () => {
+    console.log('thump.')
+  })
+
+  stream.on('close', () => {
+    console.log('close')
+  })
+
+  stream.on('parser-error', (err: Error) => {
+    console.error(err)
+  })
+})

megalodon/src/pixelfed.ts

@@ -3069,44 +3069,26 @@ export default class Pixelfed implements MegalodonInterface {
   }
 
   public async userStreaming(): Promise<WebSocketInterface> {
-    return new Promise((_, reject) => {
-      const err = new NotImplementedError('Pixelfed does not support this method')
-      reject(err)
-    })
+    return this.client.socket()
   }
 
   public async publicStreaming(): Promise<WebSocketInterface> {
-    return new Promise((_, reject) => {
-      const err = new NotImplementedError('Pixelfed does not support this method')
-      reject(err)
-    })
+    return this.client.socket()
   }
 
   public async localStreaming(): Promise<WebSocketInterface> {
-    return new Promise((_, reject) => {
-      const err = new NotImplementedError('Pixelfed does not support this method')
-      reject(err)
-    })
+    return this.client.socket()
   }
 
   public async tagStreaming(_tag: string): Promise<WebSocketInterface> {
-    return new Promise((_, reject) => {
-      const err = new NotImplementedError('Pixelfed does not support this method')
-      reject(err)
-    })
+    return this.client.socket()
   }
 
   public async listStreaming(_list_id: string): Promise<WebSocketInterface> {
-    return new Promise((_, reject) => {
-      const err = new NotImplementedError('Pixelfed does not support this method')
-      reject(err)
-    })
+    return this.client.socket()
   }
 
   public async directStreaming(): Promise<WebSocketInterface> {
-    return new Promise((_, reject) => {
-      const err = new NotImplementedError('Pixelfed does not support this method')
-      reject(err)
-    })
+    return this.client.socket()
   }
 }

megalodon/src/pixelfed/api_client.ts

@@ -8,6 +8,7 @@ import PixelfedEntity from './entity'
 import MegalodonEntity from '../entity'
 import NotificationType, { UnknownNotificationTypeError } from '../notification'
 import PixelfedNotificationType from './notification'
+import Streaming from './web_socket'
 
 namespace PixelfedAPI {
   /**
@@ -23,6 +24,7 @@ namespace PixelfedAPI {
     postForm<T = any>(path: string, params?: any, headers?: { [key: string]: string }): Promise<Response<T>>
     del<T = any>(path: string, params?: any, headers?: { [key: string]: string }): Promise<Response<T>>
     cancel(): void
+    socket(): Streaming
   }
 
   /**
@@ -359,6 +361,10 @@ namespace PixelfedAPI {
     public cancel(): void {
       return this.abortController.abort()
     }
+
+    public socket(): Streaming {
+      return new Streaming()
+    }
   }
 
   export namespace Entity {