@sockethub/platform-irc 4.0.0-alpha.12 → 4.0.0-alpha.14

package/dist/index.js

@@ -4574,6 +4574,7 @@ var require_limitLength = __commonJS((exports) => {
 var require_pattern = __commonJS((exports) => {
   Object.defineProperty(exports, "__esModule", { value: true });
   var code_1 = require_code2();
+  var util_1 = require_util();
   var codegen_1 = require_codegen();
   var error = {
     message: ({ schemaCode }) => (0, codegen_1.str)`must match pattern "${schemaCode}"`,
@@ -4586,10 +4587,18 @@ var require_pattern = __commonJS((exports) => {
     $data: true,
     error,
     code(cxt) {
-      const { data, $data, schema, schemaCode, it } = cxt;
+      const { gen, data, $data, schema, schemaCode, it } = cxt;
       const u = it.opts.unicodeRegExp ? "u" : "";
-      const regExp = $data ? (0, codegen_1._)`(new RegExp(${schemaCode}, ${u}))` : (0, code_1.usePattern)(cxt, schema);
-      cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
+      if ($data) {
+        const { regExp } = it.opts.code;
+        const regExpCode = regExp.code === "new RegExp" ? (0, codegen_1._)`new RegExp` : (0, util_1.useFunc)(gen, regExp);
+        const valid = gen.let("valid");
+        gen.try(() => gen.assign(valid, (0, codegen_1._)`${regExpCode}(${schemaCode}, ${u}).test(${data})`), () => gen.assign(valid, false));
+        cxt.fail$data((0, codegen_1._)`!${valid}`);
+      } else {
+        const regExp = (0, code_1.usePattern)(cxt, schema);
+        cxt.fail$data((0, codegen_1._)`!${regExp}.test(${data})`);
+      }
     }
   };
   exports.default = def;
@@ -15749,22 +15758,22 @@ var require_ajv_formats_draft2019 = __commonJS((exports, module) => {
   };
 });
 
-// ../../node_modules/r-result/result.js
+// ../../node_modules/irc-socket-sasl/result.js
 var require_result = __commonJS((exports, module) => {
   var inspect = __require("util").inspect;
   var Ok = function(t) {
-    const Result = Object.create(methods);
+    const Result = Object.create(resultMethods);
     Result.is_ok = true;
     Result.value = t;
     return Result;
   };
   var Fail = function(f) {
-    const Result = Object.create(methods);
+    const Result = Object.create(resultMethods);
     Result.is_ok = false;
     Result.value = f;
     return Result;
   };
-  var methods = {
+  var resultMethods = {
     ok: function(errorMessage) {
       if (this.is_ok) {
         return this.value;
@@ -15899,29 +15908,13 @@ var require_result = __commonJS((exports, module) => {
     Ok,
     Fail
   };
-  var methodToFunction = function(method) {
-    return function() {
-      var context = arguments[0];
-      var args = Array.prototype.slice.call(arguments, 1);
-      return method.apply(context, args);
-    };
-  };
-  Object.keys(methods).forEach(function(key) {
-    if (key === "inspect") {
-      return;
-    }
-    var method = methods[key];
-    module.exports[key] = methodToFunction(method);
-  });
 });
 
 // ../../node_modules/irc-socket-sasl/irc-socket.js
 var require_irc_socket = __commonJS((exports, module) => {
   var EventEmitter = __require("events").EventEmitter;
   var format = __require("util").format;
-  var rresult = require_result();
-  var Ok = rresult.Ok;
-  var Fail = rresult.Fail;
+  var { Ok, Fail } = require_result();
   var includes = function(array, value) {
     return array.indexOf(value) !== -1;
   };
@@ -15934,13 +15927,20 @@ var require_irc_socket = __commonJS((exports, module) => {
   var endsWith = function(string, postfix) {
     return string.lastIndexOf(postfix) === string.length - postfix.length;
   };
+  var encodeSaslCredential = function(mechanism, username, secret) {
+    if (mechanism === "OAUTHBEARER") {
+      return Buffer.from("n,,\x01auth=Bearer " + secret + "\x01\x01").toString("base64");
+    }
+    return Buffer.from(username + "\x00" + username + "\x00" + secret).toString("base64");
+  };
   var failures = {
     killed: "killed",
     nicknamesUnavailable: "nicknames unavailable",
     badProxyConfiguration: "bad proxy configuration",
     missingRequiredCapabilities: "missing required capabilities",
     badPassword: "bad password",
-    socketEnded: "socket ended"
+    socketEnded: "socket ended",
+    saslAuthenticationFailed: "sasl authentication failed"
   };
 
   class IrcSocket extends EventEmitter {
@@ -15965,12 +15965,16 @@ var require_irc_socket = __commonJS((exports, module) => {
       if (config.saslPassword) {
         this.saslUsername = config.saslUsername || config.username;
         this.saslPassword = config.saslPassword;
+        this.saslMechanism = (config.saslMechanism || "PLAIN").toUpperCase();
+        if (this.saslMechanism !== "PLAIN" && this.saslMechanism !== "OAUTHBEARER") {
+          throw new Error("Unsupported SASL mechanism: " + config.saslMechanism);
+        }
       }
       this.username = config.username;
       this.realname = config.realname;
       this.nicknames = config.nicknames.slice();
       this.timeout = config.timeout || 5 * 60 * 1000;
-      this.connectOptions = typeof config.connectOptions === "object" ? Object.create(config.connectOptions) : {};
+      this.connectOptions = typeof config.connectOptions === "object" && config.connectOptions !== null ? { ...config.connectOptions } : {};
       this.connectOptions.port = config.port || 6667;
       this.connectOptions.host = config.server;
       this.on("data", function(line) {
@@ -16017,6 +16021,8 @@ var require_irc_socket = __commonJS((exports, module) => {
         this.emit("connect");
         timeout = setTimeout(onSilence, timeoutPeriod);
         let serverCapabilities, acknowledgedCapabilities, sentRequests, respondedRequests, allRequestsSent, nickname;
+        let saslResponseSent = false;
+        let saslChallenge = "";
         if (this.capabilities) {
           this.capabilities.requires = this.capabilities.requires || [];
           this.capabilities.wants = this.capabilities.wants || [];
@@ -16086,7 +16092,7 @@ var require_irc_socket = __commonJS((exports, module) => {
                 acknowledgedCapabilities.push(capability);
               }
               if (acknowledgedCapabilities.includes("sasl")) {
-                this.raw(["AUTHENTICATE", "PLAIN"]);
+                this.raw(["AUTHENTICATE", this.saslMechanism || "PLAIN"]);
               }
             }
             if (sentRequests === respondedRequests) {
@@ -16100,13 +16106,48 @@ var require_irc_socket = __commonJS((exports, module) => {
             if (endsWith(line, "Login unsuccessful")) {
               this.resolvePromise(Fail(failures.badPassword));
             }
-          } else if (parts[0] === "AUTHENTICATE") {
-            if (parts[1] === "+") {
-              const encPW = Buffer.from(this.saslUsername + "\x00" + this.saslUsername + "\x00" + this.saslPassword).toString("base64");
-              this.raw(["AUTHENTICATE", encPW]);
+          } else if (parts[0] === "AUTHENTICATE" || numeric === "AUTHENTICATE") {
+            const chunkSize = 400;
+            const authArg = numeric === "AUTHENTICATE" ? parts[2] : parts[1];
+            if (!saslResponseSent) {
+              if (authArg !== "+") {
+                return;
+              }
+              const payload = encodeSaslCredential(this.saslMechanism, this.saslUsername, this.saslPassword);
+              if (payload.length === 0) {
+                this.raw(["AUTHENTICATE", "+"]);
+              } else {
+                for (let i = 0;i < payload.length; i += chunkSize) {
+                  this.raw(["AUTHENTICATE", payload.slice(i, i + chunkSize)]);
+                }
+                if (payload.length % chunkSize === 0) {
+                  this.raw(["AUTHENTICATE", "+"]);
+                }
+              }
+              saslResponseSent = true;
+            } else {
+              let challengeComplete = false;
+              if (authArg === "+") {
+                challengeComplete = true;
+              } else {
+                saslChallenge += authArg;
+                if (authArg.length < chunkSize) {
+                  challengeComplete = true;
+                }
+              }
+              if (challengeComplete) {
+                saslChallenge = "";
+                if (this.saslMechanism === "OAUTHBEARER") {
+                  this.raw(["AUTHENTICATE", "AQ=="]);
+                }
+              }
             }
           } else if (numeric === "903") {
             this.raw("CAP END");
+          } else if (numeric === "902" || numeric === "904" || numeric === "905" || numeric === "906" || numeric === "907") {
+            this.raw("QUIT");
+            this.resolvePromise(Fail(failures.saslAuthenticationFailed));
+            return;
           } else if (numeric === "001") {
             this.status = "running";
             const data = {
@@ -16251,7 +16292,7 @@ class ASEmitter {
   }
   emitEvent(code, asObject) {
     if (typeof asObject === "object" && !asObject.published) {
-      asObject.published = `${Date.now()}`;
+      asObject.published = new Date().toISOString();
     }
     this.events.emit(code, asObject);
   }
@@ -16698,7 +16739,7 @@ class IrcToActivityStreams {
           }
         };
         break;
-      case TOPIC_SET_BY:
+      case TOPIC_SET_BY: {
         if (!this.__buffer[TOPIC_IS]) {
           break;
         }
@@ -16708,10 +16749,14 @@ class IrcToActivityStreams {
           id: `${nick}@${this.server}`,
           name: nick
         };
-        this.__buffer[TOPIC_IS].published = msg[0];
+        const topicSetEpochSeconds = Number.parseInt(msg[0], 10);
+        if (Number.isFinite(topicSetEpochSeconds)) {
+          this.__buffer[TOPIC_IS].published = new Date(topicSetEpochSeconds * 1000).toISOString();
+        }
         ase.emitEvent(EVENT_INCOMING2, this.__buffer[TOPIC_IS]);
         delete this.__buffer[TOPIC_IS];
         break;
+      }
       case WHO:
       case WHO_OLD:
         nick = msg[3].length <= 2 ? msg[2] : msg[3];
@@ -16731,6 +16776,7 @@ class IrcToActivityStreams {
 // ../schemas/src/context.ts
 var AS2_BASE_CONTEXT_URL = "https://www.w3.org/ns/activitystreams";
 var SOCKETHUB_BASE_CONTEXT_URL = "https://sockethub.org/ns/context/v1.jsonld";
+var PLATFORM_CONTEXT_PREFIX = "https://sockethub.org/ns/context/platform/";
 var ERROR_PLATFORM_ID = "error";
 var ERROR_PLATFORM_CONTEXT_URL = "https://sockethub.org/ns/context/platform/error/v1.jsonld";
 var INTERNAL_PLATFORM_ID = "sockethub:internal";
@@ -16738,12 +16784,9 @@ var INTERNAL_PLATFORM_CONTEXT_URL = "https://sockethub.org/ns/context/platform/s
 var platformContextToPlatformId = new Map;
 var platformContextToSchemaId = new Map;
 var platformContextToCredentialsSchemaId = new Map;
-function buildCanonicalContext(platformContextUrl) {
-  return [
-    AS2_BASE_CONTEXT_URL,
-    SOCKETHUB_BASE_CONTEXT_URL,
-    platformContextUrl
-  ];
+function buildCanonicalContext(platform) {
+  const platformUrl = platform.startsWith("https://") ? platform : `${PLATFORM_CONTEXT_PREFIX}${platform}/v1.jsonld`;
+  return [AS2_BASE_CONTEXT_URL, SOCKETHUB_BASE_CONTEXT_URL, platformUrl];
 }
 function registerPlatformContext(platformId, platformContextUrl, schemaId, credentialsSchemaId) {
   platformContextToPlatformId.set(platformContextUrl, platformId);
@@ -16752,18 +16795,7 @@ function registerPlatformContext(platformId, platformContextUrl, schemaId, crede
 }
 
 // ../schemas/src/helpers/objects.ts
-var validObjectRefs = [];
-var validObjectDefs = {};
 var ObjectTypesSchema = {
-  credentials: {
-    required: ["type"],
-    additionalProperties: true,
-    properties: {
-      type: {
-        enum: ["credentials"]
-      }
-    }
-  },
   feed: {
     required: ["id", "type"],
     additionalProperties: true,
@@ -16789,36 +16821,6 @@ var ObjectTypesSchema = {
       }
     }
   },
-  message: {
-    required: ["type", "content"],
-    additionalProperties: true,
-    properties: {
-      type: {
-        enum: ["message"]
-      },
-      id: {
-        type: "string"
-      },
-      name: {
-        type: "string"
-      },
-      content: {
-        type: "string"
-      }
-    }
-  },
-  me: {
-    required: ["type", "content"],
-    additionalProperties: true,
-    properties: {
-      type: {
-        enum: ["me"]
-      },
-      content: {
-        type: "string"
-      }
-    }
-  },
   person: {
     required: ["id", "type"],
     additionalProperties: true,
@@ -16895,71 +16897,6 @@ var ObjectTypesSchema = {
       }
     }
   },
-  attendance: {
-    required: ["type"],
-    additionalProperties: false,
-    properties: {
-      type: {
-        enum: ["attendance"]
-      },
-      members: {
-        type: "array",
-        items: {
-          type: "string"
-        }
-      }
-    }
-  },
-  presence: {
-    required: ["type"],
-    additionalProperties: false,
-    properties: {
-      type: {
-        enum: ["presence"]
-      },
-      presence: {
-        enum: ["away", "chat", "dnd", "xa", "offline", "online"]
-      },
-      role: {
-        enum: ["owner", "member", "participant", "admin"]
-      },
-      content: {
-        type: "string"
-      }
-    }
-  },
-  relationship: {
-    required: ["type", "relationship"],
-    additionalProperties: false,
-    properties: {
-      type: {
-        enum: ["relationship"]
-      },
-      relationship: {
-        enum: ["role"]
-      },
-      subject: {
-        type: "object",
-        oneOf: [{ $ref: "#/definitions/type/presence" }]
-      },
-      object: {
-        type: "object",
-        oneOf: validObjectRefs
-      }
-    }
-  },
-  topic: {
-    required: ["type"],
-    additionalProperties: false,
-    properties: {
-      type: {
-        enum: ["topic"]
-      },
-      content: {
-        type: "string"
-      }
-    }
-  },
   address: {
     required: ["type"],
     additionalProperties: false,
@@ -16968,18 +16905,6 @@ var ObjectTypesSchema = {
         enum: ["address"]
       }
     }
-  },
-  heartbeat: {
-    required: ["type", "timestamp"],
-    additionalProperties: false,
-    properties: {
-      type: {
-        enum: ["heartbeat"]
-      },
-      timestamp: {
-        type: "number"
-      }
-    }
   }
 };
 var ObjectTypesList = Object.keys(ObjectTypesSchema);
@@ -17006,36 +16931,8 @@ var validActorRefs = ActorTypesList.map((type) => ({
 var validTargetRefs = TargetTypesList.map((type) => ({
   $ref: `#/definitions/type/${type}`
 }));
-for (const type of ObjectTypesList) {
-  if (type === "credentials") {
-    continue;
-  }
-  validObjectRefs.push({ $ref: `#/definitions/type/${type}` });
-  validObjectDefs[type] = ObjectTypesSchema[type];
-}
-
-// ../schemas/src/schemas/activity-object.ts
-var ActivityObjectSchema = {
-  $id: "https://sockethub.org/schemas/v/activity-object.json",
-  description: "Schema for Sockethub Activity Objects",
-  type: "object",
-  required: ["object"],
-  properties: {
-    object: {
-      type: "object",
-      oneOf: validObjectRefs
-    }
-  },
-  definitions: {
-    type: validObjectDefs
-  }
-};
 
 // ../schemas/src/schemas/activity-stream.ts
-var validObjectRefs2 = [];
-for (const type of ObjectTypesList) {
-  validObjectRefs2.push({ $ref: `#/definitions/type/${type}` });
-}
 var contextSchema = {
   type: "array",
   minItems: 3,
@@ -17064,6 +16961,7 @@ var ActivityStreamSchema = {
   description: "Schema for Sockethub Activity Streams",
   type: "object",
   required: ["@context", "type", "actor"],
+  additionalProperties: false,
   properties: {
     "@context": contextSchema,
     id: {
@@ -17079,8 +16977,7 @@ var ActivityStreamSchema = {
       oneOf: validTargetRefs
     },
     object: {
-      type: "object",
-      oneOf: validObjectRefs2
+      type: "object"
     },
     published: {
       type: "string",
@@ -17093,11 +16990,6 @@ var ActivityStreamSchema = {
 };
 
 // ../schemas/src/schemas/sockethub-config.ts
-var connectConfigPlatforms = {
-  connectTimeoutMs: {
-    type: "number"
-  }
-};
 var SockethubConfigSchema = {
   $id: "https://sockethub.org/schemas/v/sockethub-config.json",
   description: "Sockethub Config Schema",
@@ -17112,6 +17004,10 @@ var SockethubConfigSchema = {
       type: "boolean",
       default: true
     },
+    info: {
+      type: "boolean",
+      default: false
+    },
     logging: {
       type: "object",
       additionalProperties: false,
@@ -17132,71 +17028,88 @@ var SockethubConfigSchema = {
         }
       }
     },
+    platforms: {
+      type: "array",
+      items: {
+        type: "string"
+      },
+      default: [
+        "@sockethub/platform-dummy",
+        "@sockethub/platform-feeds",
+        "@sockethub/platform-irc",
+        "@sockethub/platform-metadata",
+        "@sockethub/platform-xmpp"
+      ]
+    },
     packageConfig: {
       type: "object",
       properties: {
-        "@sockethub/activity-streams": {
+        "@sockethub/platform-dummy": {
           type: "object",
           additionalProperties: false,
           properties: {
-            specialObjs: {
-              type: "array",
-              items: {
-                type: "string"
-              },
-              default: ["credentials"]
-            },
-            failOnUnknownObjectProperties: {
-              type: "boolean",
-              default: true
-            }
+            greeting: { type: "string", default: "Hello" }
           }
         },
-        "@sockethub/platform-dummy": {
+        "@sockethub/platform-feeds": {
           type: "object",
           additionalProperties: false,
           properties: {
-            greeting: {
-              type: "string",
-              default: "Hello"
-            }
+            connectTimeoutMs: { type: "number" },
+            allowPrivateAddresses: { type: "boolean" },
+            concurrency: { type: "integer", minimum: 1 }
           }
         },
-        "@sockethub/platform-feeds": {
+        "@sockethub/platform-irc": {
           type: "object",
           additionalProperties: false,
           properties: {
-            ...connectConfigPlatforms
+            connectTimeoutMs: { type: "number" }
           }
         },
-        "@sockethub/platform-irc": {
+        "@sockethub/platform-xmpp": {
           type: "object",
           additionalProperties: false,
           properties: {
-            ...connectConfigPlatforms
+            connectTimeoutMs: { type: "number" }
           }
         },
-        "@sockethub/platform-xmpp": {
+        "@sockethub/platform-metadata": {
           type: "object",
           additionalProperties: false,
           properties: {
-            ...connectConfigPlatforms
+            allowPrivateAddresses: { type: "boolean" },
+            concurrency: { type: "integer", minimum: 1 }
           }
         }
       }
     },
-    platforms: {
-      type: "array",
-      items: {
-        type: "string"
-      },
-      default: [
-        "@sockethub/platform-dummy",
-        "@sockethub/platform-feeds",
-        "@sockethub/platform-irc",
-        "@sockethub/platform-metadata",
-        "@sockethub/platform-xmpp"
-      ]
+    credentials: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        ttlMs: {
+          type: "number",
+          minimum: 0,
+          default: 604800000,
+          description: "Sliding TTL in milliseconds for per-session encrypted " + "credential keys in Redis, refreshed on every save and " + "read. A backstop against keys orphaned by crashes; " + "sessions normally delete their key on disconnect. " + "Size generously — idle sessions do not refresh it. " + "0 disables expiry."
+        }
+      }
+    },
+    credentialCheck: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        reconnectIpSource: {
+          type: "string",
+          enum: ["socket", "proxy"],
+          default: "socket"
+        },
+        proxyHeader: {
+          type: "string",
+          default: "x-forwarded-for"
+        }
+      }
     },
     public: {
       type: "object",
@@ -17235,6 +17148,22 @@ var SockethubConfigSchema = {
         blockDurationMs: {
           type: "number",
           default: 5000
+        },
+        maxConnectionsPerIp: {
+          type: "number",
+          minimum: 0,
+          default: 0
+        }
+      }
+    },
+    limits: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        maxPlatformInstances: {
+          type: "number",
+          minimum: 0,
+          default: 0
         }
       }
     },
@@ -17292,6 +17221,59 @@ var SockethubConfigSchema = {
         path: {
           type: "string",
           default: "/sockethub"
+        },
+        cors: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            origin: {
+              type: "string",
+              default: "*"
+            }
+          }
+        }
+      }
+    },
+    httpActions: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        enabled: {
+          type: "boolean",
+          default: false
+        },
+        path: {
+          type: "string",
+          default: "/sockethub-http"
+        },
+        requireRequestId: {
+          type: "boolean",
+          default: true
+        },
+        maxMessagesPerRequest: {
+          type: "number",
+          minimum: 1,
+          default: 20
+        },
+        maxPayloadBytes: {
+          type: "number",
+          minimum: 1,
+          default: 262144
+        },
+        idempotencyTtlMs: {
+          type: "number",
+          minimum: 0,
+          default: 300000
+        },
+        requestTimeoutMs: {
+          type: "number",
+          minimum: 0,
+          default: 30000
+        },
+        idleTimeoutMs: {
+          type: "number",
+          minimum: 0,
+          default: 15000
         }
       }
     },
@@ -17323,7 +17305,6 @@ var schemaURL = "https://sockethub.org/schemas/v0";
 var schemas = {};
 var systemContextsRegistered = false;
 schemas[`${schemaURL}/activity-stream`] = ActivityStreamSchema;
-schemas[`${schemaURL}/activity-object`] = ActivityObjectSchema;
 for (const uri in schemas) {
   ajv.addSchema(schemas[uri], uri);
 }
@@ -17353,7 +17334,7 @@ var import_irc_socket_sasl = __toESM(require_irc_socket(), 1);
 var package_default = {
   name: "@sockethub/platform-irc",
   description: "A sockethub platform module implementing IRC functionality",
-  version: "4.0.0-alpha.12",
+  version: "4.0.0-alpha.14",
   private: false,
   author: "Nick Jennings <nick@silverbucket.net>",
   license: "LGPL-3.0+",
@@ -17364,17 +17345,16 @@ var package_default = {
   main: "dist/index.js",
   exports: {
     ".": {
-      bun: "./src/index.ts",
+      types: "./dist/index.d.ts",
       import: "./dist/index.js",
       default: "./dist/index.js"
     }
   },
   files: [
-    "src/",
     "dist/"
   ],
   engines: {
-    bun: ">=1.2"
+    node: ">=20"
   },
   keywords: [
     "sockethub",
@@ -17398,23 +17378,24 @@ var package_default = {
     doc: "typedoc --options typedoc.json"
   },
   dependencies: {
-    "@sockethub/irc2as": "^4.0.0-alpha.12",
-    "irc-socket-sasl": "^4.0.0"
+    "@sockethub/irc2as": "^4.0.0-alpha.14",
+    "irc-socket-sasl": "^4.1.2"
   },
   devDependencies: {
-    "@sockethub/schemas": "^3.0.0-alpha.12",
+    "@sockethub/schemas": "^3.0.0-alpha.14",
     "@types/bun": "latest",
     typedoc: "^0.28.14"
   },
   peerDependencies: {
-    "@sockethub/server": "^5.0.0-alpha.12"
+    "@sockethub/server": "^5.0.0-alpha.14"
   },
   peerDependenciesMeta: {
     "@sockethub/server": {
       optional: true
     }
   },
-  gitHead: "cc495a5fcf7ce19a8f328a34bbc8cd1439bb67ce"
+  gitHead: "4bc8ffa00d29aa78e59e269ac6e5ea9859ec01a8",
+  types: "./dist/index.d.ts"
 };
 
 // src/schema.ts
@@ -17439,6 +17420,191 @@ var PlatformIrcSchema = {
           "announce",
           "disconnect"
         ]
+      },
+      object: {
+        oneOf: [
+          { $ref: "#/definitions/objectTypes/message" },
+          { $ref: "#/definitions/objectTypes/topic" },
+          { $ref: "#/definitions/objectTypes/address" },
+          { $ref: "#/definitions/objectTypes/attendance" }
+        ]
+      }
+    },
+    definitions: {
+      objectTypes: {
+        message: {
+          type: "object",
+          required: ["type", "content"],
+          additionalProperties: false,
+          properties: {
+            type: { enum: ["message"] },
+            content: { type: "string" }
+          }
+        },
+        topic: {
+          type: "object",
+          required: ["type", "content"],
+          additionalProperties: false,
+          properties: {
+            type: { enum: ["topic"] },
+            content: { type: "string" }
+          }
+        },
+        address: {
+          type: "object",
+          required: ["type"],
+          additionalProperties: false,
+          properties: { type: { enum: ["address"] } }
+        },
+        attendance: {
+          type: "object",
+          required: ["type"],
+          additionalProperties: false,
+          properties: { type: { enum: ["attendance"] } }
+        }
+      }
+    }
+  },
+  responses: {
+    type: "object",
+    required: ["type", "actor"],
+    additionalProperties: false,
+    properties: {
+      "@context": { type: "array", items: { type: "string" } },
+      id: { type: "string" },
+      published: { type: "string" },
+      type: {
+        enum: ["update", "send", "join", "leave", "add", "remove"]
+      },
+      actor: {
+        oneOf: [
+          { $ref: "#/definitions/responses/person" },
+          { $ref: "#/definitions/responses/service" }
+        ]
+      },
+      target: {
+        oneOf: [
+          { $ref: "#/definitions/responses/person" },
+          { $ref: "#/definitions/responses/room" },
+          { $ref: "#/definitions/responses/service" }
+        ]
+      },
+      error: { type: "string" },
+      object: {
+        oneOf: [
+          { $ref: "#/definitions/responses/message" },
+          { $ref: "#/definitions/responses/me" },
+          { $ref: "#/definitions/responses/presence" },
+          { $ref: "#/definitions/responses/topic" },
+          { $ref: "#/definitions/responses/address" },
+          { $ref: "#/definitions/responses/relationship" }
+        ]
+      }
+    },
+    definitions: {
+      responses: {
+        person: {
+          type: "object",
+          required: ["id", "type"],
+          additionalProperties: false,
+          properties: {
+            id: { type: "string" },
+            type: { enum: ["person"] },
+            name: { type: "string" }
+          }
+        },
+        service: {
+          type: "object",
+          required: ["id", "type"],
+          additionalProperties: false,
+          properties: {
+            id: { type: "string" },
+            type: { enum: ["service"] },
+            name: { type: "string" }
+          }
+        },
+        room: {
+          type: "object",
+          required: ["id", "type"],
+          additionalProperties: false,
+          properties: {
+            id: { type: "string" },
+            type: { enum: ["room"] },
+            name: { type: "string" }
+          }
+        },
+        message: {
+          type: "object",
+          required: ["type", "content"],
+          additionalProperties: false,
+          properties: {
+            type: { enum: ["message"] },
+            content: { type: "string" }
+          }
+        },
+        me: {
+          type: "object",
+          required: ["type", "content"],
+          additionalProperties: false,
+          properties: {
+            type: { enum: ["me"] },
+            content: { type: "string" }
+          }
+        },
+        presence: {
+          type: "object",
+          required: ["type"],
+          additionalProperties: false,
+          properties: {
+            type: { enum: ["presence"] },
+            role: {
+              enum: ["owner", "member", "participant", "admin"]
+            }
+          }
+        },
+        topic: {
+          type: "object",
+          required: ["type", "content"],
+          additionalProperties: false,
+          properties: {
+            type: { enum: ["topic"] },
+            content: { type: "string" }
+          }
+        },
+        address: {
+          type: "object",
+          required: ["type"],
+          additionalProperties: false,
+          properties: {
+            type: { enum: ["address"] }
+          }
+        },
+        relationship: {
+          type: "object",
+          required: ["type", "relationship"],
+          additionalProperties: false,
+          properties: {
+            type: { enum: ["relationship"] },
+            relationship: { enum: ["role"] },
+            subject: {
+              type: "object",
+              required: ["type", "role"],
+              additionalProperties: false,
+              properties: {
+                type: { enum: ["presence"] },
+                role: {
+                  enum: [
+                    "owner",
+                    "member",
+                    "participant",
+                    "admin"
+                  ]
+                }
+              }
+            },
+            object: { $ref: "#/definitions/responses/room" }
+          }
+        }
       }
     }
   },
@@ -17453,6 +17619,38 @@ var PlatformIrcSchema = {
         type: "object",
         required: ["type", "nick", "server"],
         additionalProperties: false,
+        not: { required: ["password", "token"] },
+        allOf: [
+          {
+            anyOf: [
+              {
+                not: {
+                  properties: {
+                    saslMechanism: { const: "PLAIN" }
+                  },
+                  required: ["saslMechanism"]
+                }
+              },
+              { required: ["password"] },
+              { required: ["token"] }
+            ]
+          },
+          {
+            anyOf: [
+              {
+                not: {
+                  properties: {
+                    saslMechanism: {
+                      const: "OAUTHBEARER"
+                    }
+                  },
+                  required: ["saslMechanism"]
+                }
+              },
+              { required: ["token"] }
+            ]
+          }
+        ],
         properties: {
           type: {
             type: "string"
@@ -17464,7 +17662,12 @@ var PlatformIrcSchema = {
             type: "string"
           },
           password: {
-            type: "string"
+            type: "string",
+            minLength: 1
+          },
+          token: {
+            type: "string",
+            minLength: 1
           },
           server: {
             type: "string"
@@ -17477,6 +17680,13 @@ var PlatformIrcSchema = {
           },
           sasl: {
             type: "boolean"
+          },
+          saslMechanism: {
+            type: "string",
+            enum: ["PLAIN", "OAUTHBEARER"]
+          },
+          allowInvalidCert: {
+            type: "boolean"
           }
         }
       }
@@ -17485,6 +17695,22 @@ var PlatformIrcSchema = {
 };
 
 // src/index.ts
+function flattenConnectOptions(options) {
+  const flattened = Object.create(null);
+  for (const key in options) {
+    if (key === "__proto__" || key === "constructor" || key === "prototype") {
+      continue;
+    }
+    flattened[key] = options[key];
+  }
+  return flattened;
+}
+var tlsTransport = {
+  connect(options, ...rest) {
+    return tls.connect(flattenConnectOptions(options), ...rest);
+  }
+};
+
 class IRC {
   log;
   credentialsHash;
@@ -17579,7 +17805,7 @@ class IRC {
         const { default: buildCommand } = await Promise.resolve().then(() => __toESM(require_octal_hack(), 1));
         const message = buildCommand(job.object.content);
         client.raw("PRIVMSG " + job.target.name + " :" + message);
-        return done("IRC commands temporarily disabled");
+        return done();
       }
       if (job.object.type === "notice") {
         client.raw(`NOTICE ${job.target.name} :${job.object.content}`);
@@ -17630,8 +17856,12 @@ class IRC {
         return done(err);
       }
       if (job.object.type === "attendance") {
-        this.log.debug(`query() - sending NAMES for ${job.target.name}`);
-        client.raw(["NAMES", job.target.name]);
+        const channel = this.resolveChannelName(job.target);
+        if (!channel) {
+          return done("cannot query attendance without a valid channel name");
+        }
+        this.log.debug(`query() - sending NAMES for ${channel}`);
+        client.raw(["NAMES", channel]);
         done();
       } else {
         done(`unknown 'type' '${job.object.type}'`);
@@ -17654,6 +17884,19 @@ class IRC {
     this.client = undefined;
     return done();
   }
+  resolveChannelName(target) {
+    if (typeof target?.name === "string" && target.name.startsWith("#")) {
+      return target.name;
+    }
+    if (typeof target?.id === "string") {
+      const slash = target.id.indexOf("/");
+      const candidate = slash >= 0 ? target.id.slice(slash + 1) : target.id;
+      if (candidate.startsWith("#")) {
+        return candidate;
+      }
+    }
+    return;
+  }
   isJoined(channel) {
     if (channel.indexOf("#") === 0) {
       return this.channels.has(channel);
@@ -17707,7 +17950,9 @@ class IRC {
   ircConnect(credentials, cb) {
     this.clientConnecting = true;
     const is_secure = typeof credentials.object.secure === "boolean" ? credentials.object.secure : true;
-    const is_sasl = typeof credentials.object.sasl === "boolean" ? credentials.object.sasl : !!credentials.object.password;
+    const sasl_secret = credentials.object.token || credentials.object.password;
+    const sasl_mechanism = credentials.object.saslMechanism || "PLAIN";
+    const is_sasl = typeof credentials.object.sasl === "boolean" ? credentials.object.sasl : !!sasl_secret;
     const module_options = {
       username: credentials.object.username || credentials.object.nick,
       nicknames: [credentials.object.nick],
@@ -17717,14 +17962,17 @@ class IRC {
       debug: console.log
     };
     if (is_secure) {
-      module_options.connectOptions = { rejectUnauthorized: false };
+      module_options.connectOptions = {
+        rejectUnauthorized: !credentials.object.allowInvalidCert
+      };
     }
     if (is_sasl) {
-      module_options.saslPassword = credentials.object.password;
+      module_options.saslMechanism = sasl_mechanism;
+      module_options.saslPassword = sasl_secret;
       module_options.capabilities = { requires: ["sasl"] };
     }
-    this.log.debug(`attempting to connect to ${module_options.server}:${module_options.port} transport: ${is_secure ? "secure" : "clear"} sasl: ${is_sasl}`);
-    const client = new import_irc_socket_sasl.default(module_options, is_secure ? tls : net);
+    this.log.debug(`attempting to connect to ${module_options.server}:${module_options.port} transport: ${is_secure ? "secure" : "clear"} sasl: ${is_sasl}${is_sasl ? ` (${sasl_mechanism})` : ""}`);
+    const client = new import_irc_socket_sasl.default(module_options, is_secure ? tlsTransport : net);
     const forceDisconnect = (err) => {
       this.forceDisconnect = true;
       this.clientConnecting = false;
@@ -17802,12 +18050,15 @@ class IRC {
     });
     this.irc2as.events.on("ping", (timestamp) => {
       this.log.debug(`received PING at ${timestamp}`);
-      this.client.raw("PONG");
+      this.client?.raw("PONG");
     });
   }
 }
+var src_default = IRC;
 export {
-  IRC as default
+  flattenConnectOptions,
+  src_default as default,
+  IRC
 };
 
-//# debugId=D2F4C2CE472DA48C64756E2164756E21
+//# debugId=C6F79160F59E2E1364756E2164756E21