sockethub 4.1.0 → 5.0.0-alpha.0

package/dist/bootstrap/init.js

@@ -55,7 +55,7 @@ else if (config_1.default.get('info')) {
             // eslint-disable-next-line security-node/detect-crlf
             console.log('  ' + platform.id + ' v' + platform.version);
             // eslint-disable-next-line security-node/detect-crlf
-            console.log('    AS @types: ' + platform['@types']);
+            console.log('    AS types: ' + platform.types.join(', '));
         }
         console.log();
         process.exit();

package/dist/bootstrap/init.js.map

@@ -1 +1 @@
-{"version":3,"file":"init.js","sourceRoot":"/","sources":["bootstrap/init.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"init.js","sourceRoot":"/","sources":["bootstrap/init.ts"],"names":[],"mappings":"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"}

package/dist/bootstrap/platforms.js

@@ -5,8 +5,7 @@
  * platforms, and whitelisting or blacklisting (or neither) based on the
  * config.
  */
-const tv4     = require('tv4'),
-      debug   = require('debug'),
+const debug   = require('debug'),
       schemas = require('sockethub-schemas'),
       findup  = require('findup-sync');
 
@@ -36,11 +35,11 @@ function platformIsAccepted(platformName) {
 }
 
 // if the platform schema lists valid types it implements (essentially methods/verbs for
-// sockethub to call) the add it to the supported types list.
+// sockethub to call) then add it to the supported types list.
 function platformListsSupportedTypes(p) {
-  return ((p.schema.messages.properties) && (p.schema.messages.properties['@type']) &&
-    (p.schema.messages.properties['@type'].enum) &&
-    (p.schema.messages.properties['@type'].enum.length > 0));
+  return ((p.schema.messages.properties) && (p.schema.messages.properties.type) &&
+    (p.schema.messages.properties.type.enum) &&
+    (p.schema.messages.properties.type.enum.length > 0));
 }
 
 module.exports = function platformLoad(moduleList) {
@@ -66,10 +65,9 @@ module.exports = function platformLoad(moduleList) {
         const packageJson = require(path + '/package.json');
         let types = [];
 
-        // validate schema property
-        if (! tv4.validate(p.schema, schemas.platform)) {
-          throw new Error(
-            `${platformName} platform schema failed to validate: ${tv4.error.message}`);
+        const err = schemas.validator.validatePlatformSchema(p.schema);
+        if (err) {
+          throw new Error(`${platformName} ${err}`);
         } else if (typeof p.config !== 'object') {
           throw new Error(
             `${platformName} platform must have a config property that is an object.`);
@@ -77,27 +75,25 @@ module.exports = function platformLoad(moduleList) {
           if (p.schema.credentials) {
             // register the platforms credentials schema
             types.push('credentials');
-            tv4.addSchema(`http://sockethub.org/schemas/v0/context/${platformName}/credentials`,
-              p.schema.credentials);
           } else {
             p.config.noCredentials = true;
           }
-
         }
 
-        tv4.addSchema(`http://sockethub.org/schemas/v0/context/${platformName}/messages`,
-          p.schema.messages);
-
         if (platformListsSupportedTypes(p)) {
-          types = [...types, ...p.schema.messages.properties['@type'].enum];
+          types = [...types, ...p.schema.messages.properties.type.enum];
         }
 
         platforms.set(platformName, {
           id: platformName,
           moduleName: moduleName,
           config: p.config,
+          schemas: {
+            credentials: p.schema.credentials || {},
+            messages: p.schema.messages || {}
+          },
           version: packageJson.version,
-          '@types': types.join(', ')
+          types: types
         });
       }
     }

package/dist/janitor.js

@@ -40,10 +40,10 @@ function janitorCycle() {
         const sockets = yield serve_1.default.io.fetchSockets();
         if (!(cycleCount % 4)) {
             reportCount++;
-            rmLog(`sessions: ${sockets.length} instances: ${platform_instance_1.platformInstances.size}`);
+            rmLog(`socket sessions: ${sockets.length} platform instances: ${platform_instance_1.platformInstances.size}`);
         }
         for (let platformInstance of platform_instance_1.platformInstances.values()) {
-            removeStaleSessions(platformInstance, sockets);
+            removeStaleSocketSessions(platformInstance, sockets);
             // Static platforms are for global use, not tied to a unique to session / eg. credentials)
             if ((!platformInstance.global) && (platformInstance.sessions.size === 0)) {
                 removeStalePlatformInstance(platformInstance);
@@ -62,12 +62,18 @@ function socketExists(sessionId, sockets) {
     }
     return false;
 }
-function removeStaleSessions(platformInstance, sockets) {
-    for (let sessionId of platformInstance.sessions.values()) {
+function removeSessionCallbacks(platformInstance, sessionId) {
+    for (const key in platformInstance.sessionCallbacks) {
+        platformInstance.sessionCallbacks[key].delete(sessionId);
+    }
+}
+function removeStaleSocketSessions(platformInstance, sockets) {
+    for (const sessionId of platformInstance.sessions.values()) {
         if (!socketExists(sessionId, sockets)) {
-            rmLog('removing stale session reference ' + sessionId + ' in platform instance '
+            rmLog('removing stale socket session reference ' + sessionId + ' in platform instance '
                 + platformInstance.id);
             platformInstance.sessions.delete(sessionId);
+            removeSessionCallbacks(platformInstance, sessionId);
         }
     }
 }

package/dist/janitor.js.map

@@ -1 +1 @@
-{"version":3,"file":"janitor.js","sourceRoot":"/","sources":["janitor.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,kDAA0B;AAE1B,2DAAwD;AACxD,oDAA4B;AAE5B,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,mBAAmB,CAAC,CAAC;AAEzC,MAAM,IAAI,GAAG,KAAK,CAAC;AACnB,IAAI,aAAa,GAAY,KAAK,CAAC;AACnC,IAAI,UAAU,GAAW,CAAC,CAAC,CAAG,sCAAsC;AACpE,IAAI,WAAW,GAAW,CAAC,CAAC,CAAE,sCAAsC;AAEpE;;;;;;GAMG;AACH,SAAS,YAAY;IACnB,IAAI,CAAE,aAAa,EAAE;QAAE,aAAa,GAAG,IAAI,CAAC;KAAE;SACzC;QAAE,OAAO;KAAE;IAChB,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACvC,WAAW,CAAC,GAAS,EAAE;QACrB,UAAU,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,MAAM,eAAK,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC;QAE9C,IAAI,CAAE,CAAC,UAAU,GAAG,CAAC,CAAC,EAAE;YACtB,WAAW,EAAE,CAAC;YACd,KAAK,CAAC,aAAa,OAAO,CAAC,MAAM,eAAe,qCAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;SAC3E;QAED,KAAK,IAAI,gBAAgB,IAAI,qCAAiB,CAAC,MAAM,EAAE,EAAE;YACvD,mBAAmB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;YAC/C,0FAA0F;YAC1F,IAAI,CAAC,CAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,CAAC,EAAE;gBACzE,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;aAC/C;iBAAM;gBACL,gBAAgB,CAAC,qBAAqB,GAAG,KAAK,CAAC;aAChD;SACF;IACH,CAAC,CAAA,EAAE,IAAI,CAAC,CAAC;AACX,CAAC;AAED,SAAS,YAAY,CAAC,SAAS,EAAE,OAAO;IACtC,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;QAC1B,IAAI,MAAM,CAAC,EAAE,KAAK,SAAS,EAAE;YAC3B,OAAO,IAAI,CAAC;SACb;KACF;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,mBAAmB,CAAC,gBAAgB,EAAE,OAAO;IACpD,KAAK,IAAI,SAAS,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;QACxD,IAAI,CAAE,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE;YACtC,KAAK,CAAC,mCAAmC,GAAG,SAAS,GAAG,wBAAwB;kBAC5E,gBAAgB,CAAC,EAAE,CAAC,CAAC;YACzB,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAC7C;KACF;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,gBAAgB;IACnD,IAAI,gBAAgB,CAAC,qBAAqB,EAAE;QAC1C,KAAK,CAAC,iCAAiC,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;QAC9D,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,YAAY;KACzC;SAAM;QACL,KAAK,CAAC,8CAA8C,gBAAgB,CAAC,EAAE,GAAG;YACxE,gCAAgC,CAAC,CAAC;QACpC,gBAAgB,CAAC,qBAAqB,GAAG,IAAI,CAAC;KAC/C;AACH,CAAC;AAED,MAAM,OAAO,GAAG;IACd,KAAK,EAAE,YAAY;IACnB,aAAa,EAAE,aAAa;IAC5B,UAAU,EAAE,UAAU;IACtB,WAAW,EAAE,WAAW;CACzB,CAAC;AACF,kBAAe,OAAO,CAAC"}
+{"version":3,"file":"janitor.js","sourceRoot":"/","sources":["janitor.ts"],"names":[],"mappings":"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"}

package/dist/middleware/create-activity-object.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-activity-object.js","sourceRoot":"/","sources":["middleware/create-activity-object.ts"],"names":[],"mappings":";;;;;AAAA,wEAA+C;AAE/C,uDAA+B;AAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC,gBAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;AAEtE;;;;GAIG;AACH,SAAwB,oBAAoB,CAAC,GAAmB,EAAE,IAAc;IAC9E,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;AACZ,CAAC;AAHD,uCAGC"}
+{"version":3,"file":"create-activity-object.js","sourceRoot":"/","sources":["middleware/create-activity-object.ts"],"names":[],"mappings":";;;;;AAAA,wEAA+C;AAC/C,uDAA+B;AAC/B,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC,gBAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;AAEtE;;;;GAIG;AACH,SAAwB,oBAAoB,CAAC,GAAQ,EAAE,IAAc;IACnE,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,GAAG,CAAC,CAAC;AACZ,CAAC;AAHD,uCAGC"}

package/dist/middleware/expand-activity-stream.js

@@ -0,0 +1,33 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const activity_streams_1 = __importDefault(require("activity-streams"));
+const config_1 = __importDefault(require("../config"));
+const activity = (0, activity_streams_1.default)(config_1.default.get('activity-streams:opts'));
+function ensureObject(msg) {
+    return !((typeof msg !== 'object') || (Array.isArray(msg)));
+}
+function expandActivityStream(msg, done) {
+    if (!ensureObject(msg)) {
+        done(new Error(`message received is not an object.`));
+    }
+    else if (typeof msg.context !== 'string') {
+        done(new Error('activity stream must contain a context property'));
+    }
+    else if (typeof msg.type !== 'string') {
+        done(new Error('activity stream must contain a type property.'));
+    }
+    else {
+        msg = activity.Stream(msg);
+        if (!msg.actor) {
+            done(new Error('activity stream must contain an actor property.'));
+        }
+        else {
+            done(msg);
+        }
+    }
+}
+exports.default = expandActivityStream;
+//# sourceMappingURL=/middleware/expand-activity-stream.js.map

package/dist/middleware/expand-activity-stream.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expand-activity-stream.js","sourceRoot":"/","sources":["middleware/expand-activity-stream.ts"],"names":[],"mappings":";;;;;AAAA,wEAA+C;AAE/C,uDAA+B;AAG/B,MAAM,QAAQ,GAAG,IAAA,0BAAe,EAAC,gBAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;AAEtE,SAAS,YAAY,CAAC,GAAQ;IAC5B,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC;AAED,SAAwB,oBAAoB,CAAC,GAAmB,EAAE,IAAc;IAC9E,IAAI,CAAE,YAAY,CAAC,GAAG,CAAC,EAAE;QACvB,IAAI,CAAC,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC,CAAC;KACvD;SAAM,IAAI,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ,EAAE;QAC1C,IAAI,CAAC,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC,CAAC;KACpE;SAAO,IAAI,OAAO,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE;QACxC,IAAI,CAAC,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC,CAAC;KAClE;SAAM;QACL,GAAG,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,CAAE,GAAG,CAAC,KAAK,EAAE;YACf,IAAI,CAAC,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC,CAAC;SACpE;aAAM;YACL,IAAI,CAAC,GAAG,CAAC,CAAC;SACX;KACF;AACH,CAAC;AAfD,uCAeC"}

package/dist/middleware/expand-activity-stream.test.data.js

@@ -0,0 +1,360 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = [
+    {
+        "name": "not an object",
+        "valid": false,
+        "type": "message",
+        "input": "hello world",
+        "error": "Error: message received is not an object."
+    },
+    {
+        "name": "basic invalid type",
+        "valid": true,
+        "type": "credentials",
+        "input": {
+            "id": "foo",
+            "type": "send",
+            "context": "dummy",
+            "actor": {
+                "id": "dood@irc.freenode.net",
+                "type": "person",
+                "name": "dood"
+            },
+            "target": {
+                "id": "irc.freenode.net/sockethub",
+                "type": "person",
+                "name": "sockethub"
+            },
+            "object": {
+                "type": "credentials"
+            }
+        },
+        "output": "same"
+    },
+    {
+        "name": "basic valid type",
+        "valid": true,
+        "type": "credentials",
+        "input": {
+            "id": "foo",
+            "type": "credentials",
+            "context": "dummy",
+            "actor": {
+                "id": "dood@irc.freenode.net",
+                "type": "person",
+                "name": "dood"
+            },
+            "target": {
+                "id": "irc.freenode.net/sockethub",
+                "type": "person",
+                "name": "sockethub"
+            },
+            "object": {
+                "type": "credentials"
+            }
+        },
+        "output": "same"
+    },
+    {
+        "name": "new format",
+        "valid": true,
+        "type": "credentials",
+        "input": {
+            "type": "credentials",
+            "context": "irc",
+            "actor": {
+                "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"
+            },
+            "object": {
+                "type": "credentials",
+                "nick": "sh-9K3Vk",
+                "port": 6667,
+                "secure": false,
+                "server": "irc.freenode.net"
+            }
+        },
+        "output": "same"
+    },
+    {
+        "name": "no type specified",
+        "valid": false,
+        "type": "credentials",
+        "input": {
+            "actor": "hyper_rau@localhost",
+            "context": "xmpp",
+            "object": {
+                "username": "hyper_rau",
+                "password": "123",
+                "server": "localhost",
+                "port": 5222,
+                "resource": "laptop"
+            }
+        },
+        "error": "Error: activity stream must contain a type property."
+    },
+    {
+        "name": "expand unknown actor",
+        "type": "message",
+        "valid": "true",
+        "input": {
+            "context": "foo",
+            "type": "bar",
+            "actor": "foo@bar",
+            "object": {
+                "content": "bar"
+            }
+        },
+        "output": {
+            "context": "foo",
+            "type": "bar",
+            "actor": {
+                "id": "foo@bar"
+            },
+            "object": {
+                "content": "bar"
+            }
+        }
+    },
+    {
+        "name": "expand unknown actor 2",
+        "type": "message",
+        "valid": "true",
+        "input": {
+            "context": "foo",
+            "type": "bar",
+            "actor": "someone@example.org/resource",
+            "object": {
+                "content": "bar"
+            }
+        },
+        "output": {
+            "context": "foo",
+            "type": "bar",
+            "actor": {
+                "id": "someone@example.org/resource"
+            },
+            "object": {
+                "content": "bar"
+            }
+        }
+    },
+    {
+        "name": "expand unknown actor 2",
+        "type": "message",
+        "valid": "true",
+        "input": {
+            "context": "foo",
+            "type": "bar",
+            "actor": "xmpp:someone@example.org/resource",
+            "object": {
+                "content": "bar"
+            }
+        },
+        "output": {
+            "context": "foo",
+            "type": "bar",
+            "actor": {
+                "id": "xmpp:someone@example.org/resource"
+            },
+            "object": {
+                "content": "bar"
+            }
+        }
+    },
+    {
+        "name": "person",
+        "type": "message",
+        "valid": true,
+        "input": {
+            "context": "some context",
+            "type": "some type",
+            "actor": "blah",
+            "object": {}
+        },
+        "output": {
+            "context": "some context",
+            "type": "some type",
+            "actor": {
+                "id": "blah",
+                "type": "person",
+                "name": "dood"
+            },
+            "object": {}
+        }
+    },
+    {
+        "name": "person with extras",
+        "valid": true,
+        "type": "message",
+        "input": {
+            "context": "some context",
+            "type": "some type",
+            "actor": "blah2",
+            "object": {}
+        },
+        "output": {
+            "context": "some context",
+            "type": "some type",
+            "actor": {
+                "id": "blah2",
+                "type": "person",
+                "name": "bob",
+                "hello": "there",
+                "i": [
+                    "am",
+                    "extras"
+                ]
+            },
+            "object": {}
+        }
+    },
+    {
+        "name": "bad parent object",
+        "valid": false,
+        "type": "message",
+        "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"
+            }
+        },
+        "error": "Error: activity stream must contain a context property"
+    },
+    {
+        "name": "no actor specified",
+        "valid": false,
+        "type": "message",
+        "input": {
+            "type": "some type",
+            "context": "xmpp",
+            "object": {
+                "type": "error",
+                "content": "error message"
+            }
+        },
+        "error": "Error: activity stream must contain an actor property."
+    },
+    {
+        "name": "expand actor and target of unknowns",
+        "valid": true,
+        "type": "message",
+        "input": {
+            "actor": "irc://uuu@localhost",
+            "type": "join",
+            "context": "irc",
+            "target": "irc://irc.dooder.net/a-room"
+        },
+        "output": {
+            "actor": {
+                "id": "irc://uuu@localhost"
+            },
+            "type": "join",
+            "context": "irc",
+            "target": {
+                "id": "irc://irc.dooder.net/a-room"
+            }
+        }
+    },
+    {
+        "name": "expand actor and target of unknowns",
+        "valid": true,
+        "type": "message",
+        "input": {
+            "actor": "hyper_rau@localhost",
+            "type": "join",
+            "context": "xmpp",
+            "object": {},
+            "target": "dooder"
+        },
+        "output": {
+            "actor": {
+                "id": "hyper_rau@localhost"
+            },
+            "type": "join",
+            "context": "xmpp",
+            "object": {},
+            "target": {
+                "id": "dooder"
+            }
+        }
+    },
+    {
+        "name": "expand known person",
+        "valid": true,
+        "type": "message",
+        "input": {
+            "actor": "sh-9K3Vk@irc.freenode.net",
+            "target": "blah3",
+            "type": "send",
+            "context": "irc",
+            "object": {}
+        },
+        "output": {
+            "actor": {
+                "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"
+            },
+            "target": {
+                "id": "blah3",
+                "type": "person",
+                "name": "bob",
+                "hello": "there",
+                "i": [
+                    "am",
+                    "extras"
+                ]
+            },
+            "type": "send",
+            "context": "irc",
+            "object": {}
+        }
+    }
+];
+//# sourceMappingURL=/middleware/expand-activity-stream.test.data.js.map

package/dist/middleware/expand-activity-stream.test.data.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expand-activity-stream.test.data.js","sourceRoot":"/","sources":["middleware/expand-activity-stream.test.data.ts"],"names":[],"mappings":"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"}

package/dist/middleware/store-credentials.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 function storeCredentials(store, sessionLog) {
     return (creds, done) => {
-        store.save(creds.actor['@id'], creds, (err) => {
+        store.save(creds.actor.id, creds, (err) => {
             if (err) {
                 sessionLog('error saving credentials to store ' + err);
                 done(err);

package/dist/middleware/store-credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"store-credentials.js","sourceRoot":"/","sources":["middleware/store-credentials.ts"],"names":[],"mappings":";;AAGA,SAAwB,gBAAgB,CAAC,KAA2B,EAAE,UAAoB;IACxF,OAAO,CAAC,KAAqB,EAAE,IAAc,EAAE,EAAE;QAC/C,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;YAC5C,IAAI,GAAG,EAAE;gBACP,UAAU,CAAC,oCAAoC,GAAG,GAAG,CAAC,CAAC;gBACvD,IAAI,CAAC,GAAG,CAAC,CAAC;aACX;iBAAM;gBACL,UAAU,CAAC,iCAAiC,CAAC,CAAC;gBAC9C,IAAI,EAAE,CAAC;aACR;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAZD,mCAYC;AAAA,CAAC"}
+{"version":3,"file":"store-credentials.js","sourceRoot":"/","sources":["middleware/store-credentials.ts"],"names":[],"mappings":";;AAGA,SAAwB,gBAAgB,CAAC,KAA2B,EAAE,UAAoB;IACxF,OAAO,CAAC,KAAqB,EAAE,IAAc,EAAE,EAAE;QAC/C,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE;YACxC,IAAI,GAAG,EAAE;gBACP,UAAU,CAAC,oCAAoC,GAAG,GAAG,CAAC,CAAC;gBACvD,IAAI,CAAC,GAAG,CAAC,CAAC;aACX;iBAAM;gBACL,UAAU,CAAC,iCAAiC,CAAC,CAAC;gBAC9C,IAAI,EAAE,CAAC;aACR;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAZD,mCAYC;AAAA,CAAC"}