@sockethub/server 5.0.0-alpha.3 → 5.0.0-alpha.6

package/src/middleware/validate.test.data.ts

@@ -1,261 +1,259 @@
 export default [
-  {
-    "name": "mismatched types",
-    "valid": false,
-    "type": "credentials",
-    "input":{
-      "id":"blah",
-      "type":"send",
-      "context":"fake",
-      "actor":{
-        "id":"dood@irc.freenode.net",
-        "type":"person",
-        "name":"dood"
-      },
-      "target":{
-        "id":"irc.freenode.net/service",
-        "type":"person",
-        "name":"service"
-      },
-      "object":{
-        "type":"credentials",
-        "user": 'foo',
-        "pass": 'bar'
-      }
+    {
+        name: "mismatched types",
+        valid: false,
+        type: "credentials",
+        input: {
+            id: "blah",
+            type: "send",
+            context: "fakeplatform",
+            actor: {
+                id: "dood@irc.freenode.net",
+                type: "person",
+                name: "dood",
+            },
+            target: {
+                id: "irc.freenode.net/service",
+                type: "person",
+                name: "service",
+            },
+            object: {
+                type: "credentials",
+                user: "foo",
+                pass: "bar",
+            },
+        },
+        error: "Error: credential activity streams must have credentials set as type",
     },
-    'error': "Error: credential activity streams must have credentials set as type"
-  },
-  {
-    "name": "basic",
-    "valid":true,
-    "type":"credentials",
-    "input":{
-      "id":"blah",
-      "type":"credentials",
-      "context":"fake",
-      "actor":{
-        "id":"dood@irc.freenode.net",
-        "type":"person",
-        "name":"dood"
-      },
-      "object":{
-        'type': 'credentials',
-        "user": 'foo',
-        "pass": 'bar'
-      }
+    {
+        name: "basic",
+        valid: true,
+        type: "credentials",
+        input: {
+            id: "blah",
+            type: "credentials",
+            context: "fakeplatform",
+            actor: {
+                id: "dood@irc.freenode.net",
+                type: "person",
+                name: "dood",
+            },
+            object: {
+                type: "credentials",
+                user: "foo",
+                pass: "bar",
+            },
+        },
+        output: "same",
     },
-    "output":"same"
-  },
-  {
-    "name":"no type specified",
-    "valid":false,
-    "type":"credentials",
-    "input":{
-      "actor":"hyper_rau@localhost",
-      "context":"fake",
-      "object":{
-        "username":"hyper_rau",
-        "password":"123",
-        "server":"localhost",
-        "port":5222,
-        "resource":"laptop"
-      }
+    {
+        name: "no type specified",
+        valid: false,
+        type: "credentials",
+        input: {
+            actor: "hyper_rau@localhost",
+            context: "fakeplatform",
+            object: {
+                username: "hyper_rau",
+                password: "123",
+                server: "localhost",
+                port: 5222,
+                resource: "laptop",
+            },
+        },
+        error: "Error: credential activity streams must have credentials set as type",
     },
-    "error": "Error: credential activity streams must have credentials set as type"
-  },
-  {
-    "name":"basic person",
-    "type":"activity-object",
-    "valid":true,
-    "input":{
-      "id":"blah",
-      "type":"person",
-      "name":"dood"
+    {
+        name: "basic person",
+        type: "activity-object",
+        valid: true,
+        input: {
+            id: "blah",
+            type: "person",
+            name: "dood",
+        },
+        output: "same",
     },
-    "output":"same"
-  },
-  {
-    "name":"person with extras",
-    "valid":true,
-    "type":"activity-object",
-    "input":{
-      "id":"blah",
-      "type":"person",
-      "name":"bob",
-      "hello":"there",
-      "i":[
-        "am",
-        "extras"
-      ]
+    {
+        name: "person with extras",
+        valid: true,
+        type: "activity-object",
+        input: {
+            id: "blah",
+            type: "person",
+            name: "bob",
+            hello: "there",
+            i: ["am", "extras"],
+        },
+        output: "same",
     },
-    "output":"same"
-  },
-  {
-    "name":"alone credentials (as activity-object)",
-    "valid":false,
-    "type":"activity-object",
-    "input":{
-      "type":"credentials",
-      "nick":"sh-9K3Vk",
-      "port":6667,
-      "secure":false,
-      "server":"irc.freenode.net"
+    {
+        name: "alone credentials (as activity-object)",
+        valid: false,
+        type: "activity-object",
+        input: {
+            type: "credentials",
+            nick: "sh-9K3Vk",
+            port: 6667,
+            secure: false,
+            server: "irc.freenode.net",
+        },
+        error:
+            "Error: /object: must match exactly one schema in oneOf: " +
+            "credentials, feed, message, me, person, room, service, website, " +
+            "attendance, presence, relationship, topic, address",
     },
-    "error":
-      "Error: /object: must match exactly one schema in oneOf: " +
-      "credentials, feed, message, me, person, room, service, website, " +
-      "attendance, presence, relationship, topic, address"
-  },
-  {
-    "name":"alone credentials (as credentials)",
-    "valid":false,
-    "type":"credentials",
-    "input":{
-      "type":"credentials",
-      "nick":"sh-9K3Vk",
-      "port":6667,
-      "secure":false,
-      "server":"irc.freenode.net"
+    {
+        name: "alone credentials (as credentials)",
+        valid: false,
+        type: "credentials",
+        input: {
+            type: "credentials",
+            nick: "sh-9K3Vk",
+            port: 6667,
+            secure: false,
+            server: "irc.freenode.net",
+        },
+        error: "Error: platform context undefined not registered with this Sockethub instance.",
     },
-    "error": "Error: platform context undefined not registered with this Sockethub instance."
-  },
-  {
-    "name":"new person",
-    "valid":true,
-    "type":"activity-object",
-    "input":{
-      "id":"sh-9K3Vk@irc.freenode.net",
-      "type":"person",
-      "name":"sh-9K3Vk",
-      "image":{
-        "height":250,
-        "mediaType":"image/jpeg",
-        "url":"http://example.org/image.jpg",
-        "width":250
-      },
-      "url":"http://sockethub.org"
+    {
+        name: "new person",
+        valid: true,
+        type: "activity-object",
+        input: {
+            id: "sh-9K3Vk@irc.freenode.net",
+            type: "person",
+            name: "sh-9K3Vk",
+            image: {
+                height: 250,
+                mediaType: "image/jpeg",
+                url: "https://example.org/image.jpg",
+                width: 250,
+            },
+            url: "https://sockethub.org",
+        },
+        output: "same",
     },
-    "output":"same"
-  },
-  {
-    "name":"new person",
-    "valid":true,
-    "type":"activity-object",
-    "input":{
-      "id":"irc://sh-9K3Vk@irc.freenode.net",
-      "type":"person",
-      "name":"sh-9K3Vk",
-      "url":"http://sockethub.org"
+    {
+        name: "new person",
+        valid: true,
+        type: "activity-object",
+        input: {
+            id: "irc://sh-9K3Vk@irc.freenode.net",
+            type: "person",
+            name: "sh-9K3Vk",
+            url: "https://sockethub.org",
+        },
+        output: "same",
     },
-    "output":"same"
-  },
-  {
-    "name":"bad parent object",
-    "valid":false,
-    "type":"activity-stream",
-    "input":{
-      "string":"this is a string",
-      "array":[
-        "this",
-        "is",
-        {
-          "an":"array"
-        }
-      ],
-      "as":{
-        "id":"blah",
-        "type":"send",
-        "context":"hello",
-        "actor":{
-          "name":"dood"
+    {
+        name: "bad parent object",
+        valid: false,
+        type: "activity-stream",
+        input: {
+            string: "this is a string",
+            array: [
+                "this",
+                "is",
+                {
+                    an: "array",
+                },
+            ],
+            as: {
+                id: "blah",
+                type: "send",
+                context: "hello",
+                actor: {
+                    name: "dood",
+                },
+                target: {
+                    type: "person",
+                    name: "bob",
+                },
+                object: {
+                    type: "credentials",
+                },
+            },
+            noId: {
+                name: "dood",
+            },
+            noId2: {
+                type: "person",
+                name: "bob",
+            },
+            noDisplayName: {
+                id: "larg",
+            },
         },
-        "target":{
-          "type":"person",
-          "name":"bob"
+        error: "Error: platform context undefined not registered with this Sockethub instance.",
+    },
+    {
+        name: "unexpected AS",
+        valid: false,
+        type: "message",
+        input: {
+            actor: "irc://uuu@localhost",
+            type: "join",
+            context: "fakeplatform",
+            target: "irc://irc.dooder.net/a-room",
         },
-        "object":{
-          "type":"credentials"
-        }
-      },
-      "noId":{
-        "name":"dood"
-      },
-      "noId2":{
-        "type":"person",
-        "name":"bob"
-      },
-      "noDisplayName":{
-        "id":"larg"
-      }
+        error: "Error: [fakeplatform] /actor: must be object",
     },
-    "error": "Error: platform context undefined not registered with this Sockethub instance."
-  },
-  {
-    "name":"unexpected AS",
-    "valid":false,
-    "type":"message",
-    "input":{
-      "actor":"irc://uuu@localhost",
-      "type":"join",
-      "context":"fake",
-      "target":"irc://irc.dooder.net/a-room"
+    {
+        name: "missing type property",
+        valid: false,
+        type: "message",
+        input: {
+            actor: { id: "irc://uuu@localhost", type: "person" },
+            context: "fakeplatform",
+            target: { id: "irc://irc.dooder.net/a-room", type: "room" },
+        },
+        error: "Error: [fakeplatform] activity stream: must have required property 'type'",
     },
-    "error": "Error: /actor: must be object"
-  },
-  {
-    "name":"missing type property",
-    "valid":false,
-    "type":"message",
-    "input":{
-      "actor": { "id": "irc://uuu@localhost", "type": "person" },
-      "context":"fake",
-      "target": { "id": "irc://irc.dooder.net/a-room", "type": "room" }
+    {
+        name: "invalid context property",
+        valid: false,
+        type: "message",
+        input: {
+            actor: { id: "irc://uuu@localhost", type: "person" },
+            type: "foo",
+            context: "foobar111",
+            target: { id: "irc://irc.dooder.net/a-room", type: "room" },
+        },
+        error: "Error: platform context foobar111 not registered with this Sockethub instance.",
     },
-    "error": "Error: activity stream: must have required property \'type\'"
-  },
-  {
-    "name":"invalid context property",
-    "valid":false,
-    "type":"message",
-    "input":{
-      "actor": { "id": "irc://uuu@localhost", "type": "person" },
-      "type":"foo",
-      "context": "foobar",
-      "target": { "id": "irc://irc.dooder.net/a-room", "type": "room" }
+    {
+        name: "missing actor property",
+        valid: false,
+        type: "message",
+        input: {
+            type: "foo",
+            context: "fakeplatform",
+            target: { id: "irc://irc.dooder.net/a-room", type: "room" },
+        },
+        error: "Error: [fakeplatform] activity stream: must have required property 'actor'",
     },
-    "error": "Error: platform context foobar not registered with this Sockethub instance."
-  },
-  {
-    "name":"missing actor property",
-    "valid":false,
-    "type":"message",
-    "input":{
-      "type": "foo",
-      "context":"fake",
-      "target": { "id": "irc://irc.dooder.net/a-room", "type": "room" }
+    {
+        name: "traditional message",
+        valid: true,
+        type: "message",
+        input: {
+            type: "echo",
+            context: "fakeplatform",
+            actor: { id: "irc://uuu@localhost", type: "person" },
+        },
     },
-    "error": "Error: activity stream: must have required property \'actor\'"
-  },
-  {
-    "name":"traditional message",
-    "valid":true,
-    "type":"message",
-    "input":{
-      "type": "echo",
-      "context": "fake",
-      "actor": { "id": "irc://uuu@localhost", "type": "person" }
-    }
-  },
-  {
-    "name":"message with wrong type",
-    "valid":false,
-    "type":"message",
-    "input":{
-      "type": "foorg",
-      "context": "fake",
-      "actor": { "id": "irc://uuu@localhost", "type": "person" }
+    {
+        name: "message with wrong type",
+        valid: false,
+        type: "message",
+        input: {
+            type: "foorg",
+            context: "fakeplatform",
+            actor: { id: "irc://uuu@localhost", type: "person" },
+        },
+        error:
+            "Error: platform type foorg not supported by fakeplatform platform. " +
+            "(types: credentials, echo, fail)",
     },
-    "error": "Error: platform type foorg not supported by fake platform. " +
-      "(types: credentials, echo, fail)"
-  }
 ];

package/src/middleware/validate.test.ts

@@ -1,83 +1,44 @@
-import { expect } from 'chai';
-import proxyquire from 'proxyquire';
+import { describe, expect, it } from "bun:test";
+import type { ActivityStream } from "@sockethub/schemas";
+import getInitObject from "../bootstrap/init.js";
+import { initMockFakePlatform } from "../bootstrap/init.test.js";
+import validate from "./validate.js";
+import asObjects from "./validate.test.data.js";
 
-proxyquire.noPreserveCache();
-proxyquire.noCallThru();
+describe("Middleware: Validate", async () => {
+    const loadInitMock = await initMockFakePlatform("fakeplatform");
+    const initObj = await getInitObject(loadInitMock);
 
-class FakeSockethubPlatform {
-  constructor() {}
-  get config() {
-    return {};
-  }
-  get schema() {
-    return {
-      name: 'fake',
-      version: 'infinity',
-      credentials: {},
-      messages: {
-        "required": ["type"],
-        "properties": {
-          "type": {
-            "enum": ["echo", "fail"]
-          }
-        }
-      }
-    }
-  }
-}
-const modules = {
-  'fake-sockethub-platform': FakeSockethubPlatform
-}
-
-// @ts-ignore
-import platformLoad from './../bootstrap/platforms';
-const platforms = platformLoad(['fake-sockethub-platform'], (module) => {
-  return modules[module];
-});
-const validateMod = proxyquire('./validate', {
-  '../bootstrap/init': {
-    platforms: platforms
-  }
-});
-const validate = validateMod.default;
-
-import asObjects from "./validate.test.data";
-
-describe('platformLoad', () => {
-  it('loads all platforms', () => {
-    const expectedPlatforms = ['fake'];
-    expect(platforms.size).to.equal(expectedPlatforms.length);
-    for (let platform of expectedPlatforms) {
-      expect(platforms.has(platform)).to.be.true;
-    }
-  });
-});
-
-describe('Middleware: Validate', () => {
-
-  describe('AS object validations', () => {
-    asObjects.forEach((obj) => {
-      it(`${obj.type}: ${obj.name}, should ${obj.valid ? 'pass' : 'fail'}`, (done) => {
-        // @ts-ignore
-        validate(obj.type, 'tests')(obj.input, (msg) => {
-          if (obj.output) {
-            if (obj.output === 'same') {
-              expect(msg).to.eql(obj.input);
-            } else {
-              expect(msg).to.eql(obj.output);
-            }
-          }
-          if (obj.valid) {
-            expect(msg).to.not.be.instanceof(Error);
-          } else {
-            expect(msg).to.be.instanceof(Error);
-            if (obj.error) {
-              expect(msg.toString()).to.equal(obj.error);
-            }
-          }
-          done();
+    describe("AS object validations", () => {
+        asObjects.forEach((obj) => {
+            it(`${obj.type}: ${obj.name}, should ${
+                obj.valid ? "pass" : "fail"
+            }`, (done) => {
+                validate(
+                    obj.type,
+                    "tests",
+                    initObj,
+                )(obj.input as ActivityStream, (msg) => {
+                    if (obj.output) {
+                        if (obj.output === "same") {
+                            // @ts-ignore
+                            expect(msg).toEqual(obj.input);
+                        } else {
+                            // @ts-ignore
+                            expect(msg).toEqual(obj.output);
+                        }
+                    }
+                    if (obj.valid) {
+                        expect(msg).not.toBeInstanceOf(Error);
+                    } else {
+                        expect(msg).toBeInstanceOf(Error);
+                        if (obj.error) {
+                            expect(msg.toString()).toEqual(obj.error);
+                        }
+                    }
+                    done();
+                });
+            });
         });
-      });
     });
-  });
 });