solid-ui 2.4.27-20175fe3 → 2.4.27-2910a831

package/dist/solid-ui.js

@@ -4043,6 +4043,7 @@ var _utils = __webpack_require__(/*! @noble/hashes/utils */ "./node_modules/@nob
 var _signature = __webpack_require__(/*! ./signature */ "./lib/chat/signature.js");
 var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
 var $rdf = _interopRequireWildcard(__webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js"));
+var _cryptoKeyHelpers = __webpack_require__(/*! ../utils/cryptoKeyHelpers */ "./lib/utils/cryptoKeyHelpers.js");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function generatePrivateKey() {
@@ -4052,103 +4053,31 @@ function generatePublicKey(privateKey) {
   return (0, _utils.bytesToHex)(_secp256k.schnorr.getPublicKey(privateKey));
 }
 function getPublicKey(webId) {
-  var publicKey = publicKeyExists(webId);
+  var publicKey = (0, _cryptoKeyHelpers.publicKeyExists)(webId);
   return publicKey;
 }
-function publicKeyExists(webId) {
-  // find publickey
-  var url = new URL(webId);
-  url.hash = '';
-  /* debug.warn('Alain publicKeyExists')
-  debug.warn(webId)
-  debug.warn(url.href) */
-  _solidLogic.store.fetcher.load(url.href);
-  var publicKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
-  return publicKey === null || publicKey === void 0 ? void 0 : publicKey.value; // as NamedNode
-}
-
-var privKeyUrl = function privKeyUrl(webId) {
-  var url = new URL(webId);
-  var privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl';
-  return privateKeyUrl;
-};
-function privateKeyExists(_x) {
-  return _privateKeyExists.apply(this, arguments);
+function getPrivateKey(_x) {
+  return _getPrivateKey.apply(this, arguments);
 }
-function _privateKeyExists() {
-  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
-    var privateKeyUrl, privateKey, _err$response, data, contentType, response;
+function _getPrivateKey() {
+  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
+    var publicKeyUrl, privateKeyUrl, publicKey, privateKey, del, add;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           /* const url = new URL(webId)
-          const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
-          privateKeyUrl = privKeyUrl(webId);
-          /* debug.warn('Alain privateKeyExists')
-          debug.warn(webId)
-          debug.warn(privateKeyUrl) */
-          _context.prev = 1;
-          _solidLogic.store.fetcher.load(privateKeyUrl);
-          privateKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PrivateKey'));
-          return _context.abrupt("return", privateKey === null || privateKey === void 0 ? void 0 : privateKey.value);
-        case 7:
-          _context.prev = 7;
-          _context.t0 = _context["catch"](1);
-          if (!((_context.t0 === null || _context.t0 === void 0 ? void 0 : (_err$response = _context.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
-            _context.next = 24;
-            break;
-          }
-          _context.prev = 10;
-          // create privateKey resource
-          data = '';
-          contentType = 'text/ttl';
-          _context.next = 15;
-          return _solidLogic.store.fetcher.webOperation('PUT', privateKeyUrl, {
-            data: data,
-            contentType: contentType
-          });
-        case 15:
-          response = _context.sent;
-          _context.next = 22;
-          break;
-        case 18:
-          _context.prev = 18;
-          _context.t1 = _context["catch"](10);
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context.t1);
-          throw _context.t1;
-        case 22:
-          delete _solidLogic.store.fetcher.requested[privateKeyUrl]; // delete cached 404 error
-          return _context.abrupt("return", undefined);
-        case 24:
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context.t0);
-          throw _context.t0;
-        case 26:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[1, 7], [10, 18]]);
-  }));
-  return _privateKeyExists.apply(this, arguments);
-}
-function getPrivateKey(_x2) {
-  return _getPrivateKey.apply(this, arguments);
-}
-function _getPrivateKey() {
-  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
-    var url, privateKeyUrl, publicKey, privateKey, del, add;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          url = new URL(webId);
-          url.hash = '';
+          url.hash = '' */
           /* const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
-          privateKeyUrl = privKeyUrl(webId); // find publickey
-          publicKey = publicKeyExists(webId); // debug.warn('publicKey ' + publicKey)
-          // find privateKey
-          _context2.next = 6;
-          return privateKeyExists(webId);
-        case 6:
-          privateKey = _context2.sent;
+          publicKeyUrl = (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
+          privateKeyUrl = (0, _cryptoKeyHelpers.privKeyUrl)(webId); // find publickey
+          _context.next = 4;
+          return (0, _cryptoKeyHelpers.publicKeyExists)(webId);
+        case 4:
+          publicKey = _context.sent;
+          _context.next = 7;
+          return (0, _cryptoKeyHelpers.privateKeyExists)(webId);
+        case 7:
+          privateKey = _context.sent;
           // debug.warn('privateKey ' + privateKey)
           if (privateKey && publicKey !== generatePublicKey(privateKey)) debug.warn('publicKey is not valid');
 
@@ -4160,28 +4089,28 @@ function _getPrivateKey() {
 
           // create key pair
           if (!(!privateKey || !publicKey)) {
-            _context2.next = 19;
+            _context.next = 20;
             break;
           }
           del = [];
           add = [];
           if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyUrl)));
-          if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(url.href)));
+          if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyUrl)));
           privateKey = generatePrivateKey();
           publicKey = generatePublicKey(privateKey);
           /* debug.log('newPrivateKey-1 ' + privateKey)
           debug.log('newPublicKey-1 ' + publicKey) */
           add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyUrl)));
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.literal(publicKey), $rdf.sym(url.href)));
-          _context2.next = 19;
+          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.literal(publicKey), $rdf.sym(publicKeyUrl)));
+          _context.next = 20;
           return _solidLogic.store.updater.updateMany(del, add);
-        case 19:
-          return _context2.abrupt("return", privateKey);
         case 20:
+          return _context.abrupt("return", privateKey);
+        case 21:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _getPrivateKey.apply(this, arguments);
 }
@@ -4315,7 +4244,7 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   var latestVersion = (0, _chatLogic.mostRecentVersion)(message);
   var latestVersionCreator = _solidLogic.store.any(latestVersion, ns.foaf('maker'));
   // use latest content if same owner, else use original
-  var msgId = creator === latestVersionCreator ? latestVersion : message;
+  var msgId = creator.uri === latestVersionCreator.uri ? latestVersion : message;
   var content = _solidLogic.store.any(msgId, ns.sioc('content'));
   var signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "Proof")));
   debug.log('alain ' + (signature === null || signature === void 0 ? void 0 : signature.value));
@@ -4326,9 +4255,23 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
   msg.content = content.value;
   msg.maker = creator.uri;
+  try {
+    var publicKey = function publicKey(webId) {
+      var pubKey;
+      (0, _keys.getPublicKey)(webId).then(function (publicKey) {
+        debug.log('alain publicKey ' + publicKey);
+        pubKey = publicKey;
+      });
+      return pubKey;
+    };
+    var pubKey = publicKey(creator.uri); // await getPublicKey(creator.uri)
+    debug.log('alain pubKey ' + pubKey);
+    debug.log(creator.uri);
+  } catch (err) {
+    debug.warn(err);
+  }
   try {
     // pubKey could be store in a cache for all makers
-    var pubKey = (0, _keys.getPublicKey)(creator.uri);
     /* const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'
     debug.warn('publicKeys\n' + pubKey0 + '\n' + pubKey)
     const privKey0 = getPrivateKey(creator.uri) // alain to remove
@@ -12439,6 +12382,130 @@ function isLight(x) {
 
 /***/ }),
 
+/***/ "./lib/utils/cryptoKeyHelpers.js":
+/*!***************************************!*\
+  !*** ./lib/utils/cryptoKeyHelpers.js ***!
+  \***************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "./node_modules/@babel/runtime/helpers/interopRequireDefault.js");
+var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.privKeyUrl = void 0;
+exports.privateKeyExists = privateKeyExists;
+exports.pubKeyUrl = void 0;
+exports.publicKeyExists = publicKeyExists;
+var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js"));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ "./node_modules/@babel/runtime/helpers/asyncToGenerator.js"));
+var debug = _interopRequireWildcard(__webpack_require__(/*! ../debug */ "./lib/debug.js"));
+var _signature = __webpack_require__(/*! ../chat/signature */ "./lib/chat/signature.js");
+var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var pubKeyUrl = function pubKeyUrl(webId) {
+  var url = new URL(webId);
+  var publicKeyUrl = url.origin + '/profile/keys/publicKey.ttl';
+  return publicKeyUrl;
+};
+exports.pubKeyUrl = pubKeyUrl;
+function publicKeyExists(_x) {
+  return _publicKeyExists.apply(this, arguments);
+}
+function _publicKeyExists() {
+  _publicKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
+    var publicKey;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return _solidLogic.store.fetcher.load(pubKeyUrl(webId));
+        case 2:
+          // url.href)
+          publicKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
+          return _context.abrupt("return", publicKey === null || publicKey === void 0 ? void 0 : publicKey.value);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _publicKeyExists.apply(this, arguments);
+}
+var privKeyUrl = function privKeyUrl(webId) {
+  var url = new URL(webId);
+  var privateKeyUrl = url.origin + '/profile/keys/privateKey.ttl';
+  return privateKeyUrl;
+};
+exports.privKeyUrl = privKeyUrl;
+function privateKeyExists(_x2) {
+  return _privateKeyExists.apply(this, arguments);
+}
+function _privateKeyExists() {
+  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
+    var privateKeyUrl, privateKey, _err$response, data, contentType, response;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          /* const url = new URL(webId)
+          const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
+          privateKeyUrl = privKeyUrl(webId);
+          /* debug.warn('Alain privateKeyExists')
+          debug.warn(webId)
+          debug.warn(privateKeyUrl) */
+          _context2.prev = 1;
+          _context2.next = 4;
+          return _solidLogic.store.fetcher.load(privateKeyUrl);
+        case 4:
+          privateKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PrivateKey'));
+          return _context2.abrupt("return", privateKey === null || privateKey === void 0 ? void 0 : privateKey.value);
+        case 8:
+          _context2.prev = 8;
+          _context2.t0 = _context2["catch"](1);
+          if (!((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : (_err$response = _context2.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
+            _context2.next = 25;
+            break;
+          }
+          _context2.prev = 11;
+          // create privateKey resource
+          data = '';
+          contentType = 'text/ttl';
+          _context2.next = 16;
+          return _solidLogic.store.fetcher.webOperation('PUT', privateKeyUrl, {
+            data: data,
+            contentType: contentType
+          });
+        case 16:
+          response = _context2.sent;
+          _context2.next = 23;
+          break;
+        case 19:
+          _context2.prev = 19;
+          _context2.t1 = _context2["catch"](11);
+          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context2.t1);
+          throw _context2.t1;
+        case 23:
+          delete _solidLogic.store.fetcher.requested[privateKeyUrl]; // delete cached 404 error
+          return _context2.abrupt("return", undefined);
+        case 25:
+          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context2.t0);
+          throw _context2.t0;
+        case 27:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[1, 8], [11, 19]]);
+  }));
+  return _privateKeyExists.apply(this, arguments);
+}
+//# sourceMappingURL=cryptoKeyHelpers.js.map
+
+/***/ }),
+
 /***/ "./lib/utils/headerFooterHelpers.js":
 /*!******************************************!*\
   !*** ./lib/utils/headerFooterHelpers.js ***!
@@ -13285,8 +13352,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-04-21T21:20:00Z',
-  commit: '20175fe34b116218e9d7838365c079aa30ed7459',
+  buildTime: '2023-04-26T07:56:28Z',
+  commit: '2910a8313b68d08927570a93f57617b8573226d4',
   npmInfo: {
     'solid-ui': '2.4.27',
     npm: '8.19.4',