@veramo/url-handler 4.0.1-next.8 → 4.0.1-unstable.4

package/build/index.d.ts

@@ -4,5 +4,5 @@
  *
  * @packageDocumentation
  */
-export { UrlMessageHandler } from './message-handler';
+export { UrlMessageHandler } from './message-handler.js';
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA"}

package/build/index.js

@@ -1,12 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UrlMessageHandler = void 0;
 /**
  * Provides a {@link @veramo/url-handler#UrlMessageHandler | plugin } for the
  * {@link @veramo/message-handler#MessageHandler} that can extract a raw message from a URL query string or by fetching.
  *
  * @packageDocumentation
  */
-var message_handler_1 = require("./message-handler");
-Object.defineProperty(exports, "UrlMessageHandler", { enumerable: true, get: function () { return message_handler_1.UrlMessageHandler; } });
+export { UrlMessageHandler } from './message-handler.js';
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,qDAAqD;AAA5C,oHAAA,iBAAiB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA"}

package/build/message-handler.d.ts

@@ -1,4 +1,3 @@
-import 'cross-fetch/polyfill';
 import { IAgentContext } from '@veramo/core';
 import { Message, AbstractMessageHandler } from '@veramo/message-handler';
 /**

package/build/message-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"message-handler.d.ts","sourceRoot":"","sources":["../src/message-handler.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAA;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAOzE;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,sBAAsB;IACrD,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;CAkC7E"}
+{"version":3,"file":"message-handler.d.ts","sourceRoot":"","sources":["../src/message-handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AAOzE;;;;;GAKG;AACH,qBAAa,iBAAkB,SAAQ,sBAAsB;IACrD,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,aAAa,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC;CAkC7E"}

package/build/message-handler.js

@@ -1,73 +1,51 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UrlMessageHandler = void 0;
-require("cross-fetch/polyfill");
-const message_handler_1 = require("@veramo/message-handler");
-const parse = require("url-parse");
-const debug_1 = __importDefault(require("debug"));
-const debug = (0, debug_1.default)('veramo:url:message-handler');
+import { AbstractMessageHandler } from '@veramo/message-handler';
+import parse from 'url-parse';
+import Debug from 'debug';
+const debug = Debug('veramo:url:message-handler');
 /**
  * An implementation of {@link @veramo/message-handler#AbstractMessageHandler | AbstractMessageHandler} that can
  * extract a message from a URL.
  *
  * @public
  */
-class UrlMessageHandler extends message_handler_1.AbstractMessageHandler {
-    handle(message, context) {
-        const _super = Object.create(null, {
-            handle: { get: () => super.handle }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            if (message.raw) {
-                const parsed = parse(message.raw, {}, true);
-                if (parsed && parsed.query && parsed.query.c_i) {
-                    debug('Detected standard URL');
-                    message.raw = parsed.query.c_i;
-                    message.addMetaData({ type: 'URL', value: parsed.origin + parsed.pathname });
-                }
-                else if (parsed === null || parsed === void 0 ? void 0 : parsed.hostname) {
-                    try {
-                        const url = message.raw;
-                        debug('Fetching URL', url);
-                        const response = yield fetch(url);
-                        if ((response === null || response === void 0 ? void 0 : response.url) && response.url !== url) {
-                            debug('Detected redirect URL');
-                            const parsed2 = parse(response.url, {}, true);
-                            if (parsed2 && parsed2.query && parsed2.query.c_i) {
-                                message.raw = parsed2.query.c_i;
-                                message.addMetaData({ type: 'URL', value: parsed2.origin + parsed2.pathname });
-                            }
-                            else {
-                                message.raw = yield response.text();
-                                message.addMetaData({ type: 'URL', value: url });
-                            }
+export class UrlMessageHandler extends AbstractMessageHandler {
+    async handle(message, context) {
+        if (message.raw) {
+            const parsed = parse(message.raw, {}, true);
+            if (parsed && parsed.query && parsed.query.c_i) {
+                debug('Detected standard URL');
+                message.raw = parsed.query.c_i;
+                message.addMetaData({ type: 'URL', value: parsed.origin + parsed.pathname });
+            }
+            else if (parsed?.hostname) {
+                try {
+                    const url = message.raw;
+                    debug('Fetching URL', url);
+                    const response = await fetch(url);
+                    if (response?.url && response.url !== url) {
+                        debug('Detected redirect URL');
+                        const parsed2 = parse(response.url, {}, true);
+                        if (parsed2 && parsed2.query && parsed2.query.c_i) {
+                            message.raw = parsed2.query.c_i;
+                            message.addMetaData({ type: 'URL', value: parsed2.origin + parsed2.pathname });
                         }
                         else {
-                            message.raw = yield response.text();
+                            message.raw = await response.text();
                             message.addMetaData({ type: 'URL', value: url });
                         }
                     }
-                    catch (e) {
-                        console.log(e);
-                        debug(e.message);
+                    else {
+                        message.raw = await response.text();
+                        message.addMetaData({ type: 'URL', value: url });
                     }
                 }
+                catch (e) {
+                    console.log(e);
+                    debug(e.message);
+                }
             }
-            return _super.handle.call(this, message, context);
-        });
+        }
+        return super.handle(message, context);
     }
 }
-exports.UrlMessageHandler = UrlMessageHandler;
 //# sourceMappingURL=message-handler.js.map

package/build/message-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"message-handler.js","sourceRoot":"","sources":["../src/message-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gCAA6B;AAE7B,6DAAyE;AACzE,mCAAmC;AAEnC,kDAAyB;AAEzB,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,4BAA4B,CAAC,CAAA;AAEjD;;;;;GAKG;AACH,MAAa,iBAAkB,SAAQ,wCAAsB;IACrD,MAAM,CAAC,OAAgB,EAAE,OAA0B;;;;;YACvD,IAAI,OAAO,CAAC,GAAG,EAAE;gBACf,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;gBAC3C,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;oBAC9C,KAAK,CAAC,uBAAuB,CAAC,CAAA;oBAC9B,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAA;oBAC9B,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;iBAC7E;qBAAM,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE;oBAC3B,IAAI;wBACF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;wBACvB,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;wBAC1B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;wBACjC,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,GAAG,KAAI,QAAQ,CAAC,GAAG,KAAK,GAAG,EAAE;4BACzC,KAAK,CAAC,uBAAuB,CAAC,CAAA;4BAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;4BAC7C,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;gCACjD,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAA;gCAC/B,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;6BAC/E;iCAAM;gCACL,OAAO,CAAC,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;gCACnC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;6BACjD;yBACF;6BAAM;4BACL,OAAO,CAAC,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;4BACnC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;yBACjD;qBACF;oBAAC,OAAO,CAAM,EAAE;wBACf,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;wBACd,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;qBACjB;iBACF;aACF;YACD,OAAO,OAAM,MAAM,YAAC,OAAO,EAAE,OAAO,EAAC;QACvC,CAAC;KAAA;CACF;AAnCD,8CAmCC"}
+{"version":3,"file":"message-handler.js","sourceRoot":"","sources":["../src/message-handler.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,sBAAsB,EAAE,MAAM,yBAAyB,CAAA;AACzE,OAAO,KAAK,MAAM,WAAW,CAAA;AAE7B,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,MAAM,KAAK,GAAG,KAAK,CAAC,4BAA4B,CAAC,CAAA;AAEjD;;;;;GAKG;AACH,MAAM,OAAO,iBAAkB,SAAQ,sBAAsB;IAC3D,KAAK,CAAC,MAAM,CAAC,OAAgB,EAAE,OAA0B;QACvD,IAAI,OAAO,CAAC,GAAG,EAAE;YACf,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;YAC3C,IAAI,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE;gBAC9C,KAAK,CAAC,uBAAuB,CAAC,CAAA;gBAC9B,OAAO,CAAC,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAA;gBAC9B,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAA;aAC7E;iBAAM,IAAI,MAAM,EAAE,QAAQ,EAAE;gBAC3B,IAAI;oBACF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAA;oBACvB,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,CAAA;oBAC1B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,CAAA;oBACjC,IAAI,QAAQ,EAAE,GAAG,IAAI,QAAQ,CAAC,GAAG,KAAK,GAAG,EAAE;wBACzC,KAAK,CAAC,uBAAuB,CAAC,CAAA;wBAC9B,MAAM,OAAO,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;wBAC7C,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE;4BACjD,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAA;4BAC/B,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAA;yBAC/E;6BAAM;4BACL,OAAO,CAAC,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;4BACnC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;yBACjD;qBACF;yBAAM;wBACL,OAAO,CAAC,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;wBACnC,OAAO,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAA;qBACjD;iBACF;gBAAC,OAAO,CAAM,EAAE;oBACf,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAA;oBACd,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;iBACjB;aACF;SACF;QACD,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACvC,CAAC;CACF"}

package/build/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.25.0"
+      "packageVersion": "7.30.0"
     }
   ]
 }

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@veramo/url-handler",
   "description": "Veramo message handler plugin to decode URL messages.",
-  "version": "4.0.1-next.8+1b02e2aa",
+  "version": "4.0.1-unstable.4+a20894d6",
   "main": "build/index.js",
+  "exports": "./build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
     "build": "tsc",
     "extract-api": "yarn veramo dev extract-api"
   },
   "dependencies": {
-    "@veramo/core": "^4.0.1-next.8+1b02e2aa",
-    "@veramo/message-handler": "^4.0.1-next.8+1b02e2aa",
+    "@veramo/core": "^4.0.1-unstable.4+a20894d6",
+    "@veramo/message-handler": "^4.0.1-unstable.4+a20894d6",
     "cross-fetch": "^3.1.4",
     "debug": "^4.3.3",
     "url-parse": "^1.5.4"
@@ -36,5 +37,10 @@
   ],
   "license": "Apache-2.0",
   "keywords": [],
-  "gitHead": "1b02e2aa9af6d3ad0890a26ecec89e58b70e7e6f"
+  "type": "module",
+  "moduleDirectories": [
+    "node_modules",
+    "src"
+  ],
+  "gitHead": "a20894d60b23ab098391dd9d8ff6f96474081dc5"
 }

package/src/__tests__/message-handler.test.ts

@@ -1,7 +1,8 @@
 import { Message } from '@veramo/message-handler'
-import { UrlMessageHandler } from '../index'
+import { UrlMessageHandler } from '../index.js'
 import fetchMock, { MockParams } from 'jest-fetch-mock'
 import { IAgent } from '@veramo/core'
+import { jest } from '@jest/globals'
 fetchMock.enableMocks()
 
 const context = {
@@ -18,6 +19,7 @@ describe('@veramo/url-handler', () => {
 
   it('should reject unknown message type', async () => {
     const message = new Message({ raw: 'test', metaData: [{ type: 'test' }] })
+    // @ts-ignore
     await expect(messageHandler.handle(message, context)).rejects.toThrow('Unsupported message type')
   })
 
@@ -32,6 +34,7 @@ describe('@veramo/url-handler', () => {
         },
       ],
     })
+    // @ts-ignore
     await expect(messageHandler.handle(message, context)).rejects.toThrow('Unsupported message type')
     expect(message.raw).toEqual(JWT)
   })
@@ -41,6 +44,7 @@ describe('@veramo/url-handler', () => {
     fetchMock.mockResponse('mockbody')
     expect.assertions(2)
 
+    // @ts-ignore
     await expect(messageHandler.handle(message, context)).rejects.toThrow('Unsupported message type')
 
     expect(message.raw).toEqual('mockbody')
@@ -54,6 +58,7 @@ describe('@veramo/url-handler', () => {
     } as MockParams)
     expect.assertions(2)
 
+    // @ts-ignore
     await expect(messageHandler.handle(message, context)).rejects.toThrow('Unsupported message type')
 
     expect(message.raw).toEqual('asdf')
@@ -67,6 +72,7 @@ describe('@veramo/url-handler', () => {
     } as MockParams)
     expect.assertions(2)
 
+    // @ts-ignore
     await expect(messageHandler.handle(message, context)).rejects.toThrow('Unsupported message type')
 
     expect(message.raw).toEqual('otherbody')

package/src/index.ts

@@ -4,4 +4,4 @@
  *
  * @packageDocumentation
  */
-export { UrlMessageHandler } from './message-handler'
+export { UrlMessageHandler } from './message-handler.js'

package/src/message-handler.ts

@@ -1,7 +1,6 @@
-import 'cross-fetch/polyfill'
 import { IAgentContext } from '@veramo/core'
 import { Message, AbstractMessageHandler } from '@veramo/message-handler'
-import parse = require('url-parse')
+import parse from 'url-parse'
 
 import Debug from 'debug'