permaweb-deploy 2.4.0 → 2.5.0

package/dist/index.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var _turboSdk = require("@ardrive/turbo-sdk");
 var _fs = _interopRequireDefault(require("fs"));
 var _yargs = _interopRequireDefault(require("yargs"));
@@ -8,15 +9,25 @@ var _helpers = require("yargs/helpers");
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
 var _sdk = require("@ar.io/sdk");
 var _aoconnect = require("@permaweb/aoconnect");
+var _nodeStream = require("node:stream");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
 function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 var arweaveTxIdRegex = /^[a-zA-Z0-9-_]{43}$/;
@@ -74,7 +85,7 @@ if (ARIO_PROCESS === 'mainnet') {
   ARIO_PROCESS = _sdk.ARIO_TESTNET_PROCESS_ID;
 }
 _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-  var ario, arnsNameRecord, signer, token, jwk, turbo, uploadResult, txOrManifestId, mimeType, ant, _t, _t2;
+  var ario, arnsNameRecord, signer, token, jwk, turbo, uploadResult, txOrManifestId, mimeType, origPaths, newPaths, replaceManifest, _i, _Object$entries, _Object$entries$_i, key, value, newKey, newManifest, buffer, _yield$turbo$uploadFi, id, ant, _t, _t2;
   return _regenerator().w(function (_context) {
     while (1) switch (_context.n) {
       case 0:
@@ -180,7 +191,7 @@ _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       case 9:
         uploadResult = _context.v;
         txOrManifestId = uploadResult.id;
-        _context.n = 12;
+        _context.n = 13;
         break;
       case 10:
         _context.n = 11;
@@ -200,8 +211,52 @@ _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
         });
       case 11:
         uploadResult = _context.v;
-        txOrManifestId = uploadResult.manifestResponse.id;
+        txOrManifestId = uploadResult.manifestResponse.id; //might replace now
+
+        // Make default folder paths work by adding extra path entries
+        origPaths = uploadResult.manifest.paths;
+        newPaths = {};
+        replaceManifest = false;
+        for (_i = 0, _Object$entries = Object.entries(origPaths); _i < _Object$entries.length; _i++) {
+          _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2), key = _Object$entries$_i[0], value = _Object$entries$_i[1];
+          newPaths[key] = value;
+          if (key.endsWith('/index.html')) {
+            newKey = key.replace(/\/index\.html$/, '');
+            newPaths[newKey] = value;
+            replaceManifest = true;
+          }
+          ;
+        }
+        ;
+        if (!replaceManifest) {
+          _context.n = 13;
+          break;
+        }
+        console.info('replacing manifest');
+        newManifest = _objectSpread(_objectSpread({}, uploadResult.manifest), {}, {
+          paths: newPaths
+        });
+        buffer = Buffer.from(JSON.stringify(newManifest));
+        _context.n = 12;
+        return turbo.uploadFile({
+          fileStreamFactory: function fileStreamFactory() {
+            return _nodeStream.Readable.from(buffer);
+          },
+          fileSizeFactory: function fileSizeFactory() {
+            return buffer.length;
+          },
+          dataItemOpts: {
+            tags: [{
+              name: 'Content-Type',
+              value: 'application/x.arweave-manifest+json'
+            }]
+          }
+        });
       case 12:
+        _yield$turbo$uploadFi = _context.v;
+        id = _yield$turbo$uploadFi.id;
+        txOrManifestId = id;
+      case 13:
         console.log('-------------------- DEPLOY DETAILS --------------------');
         console.log("Tx ID: ".concat(txOrManifestId));
         console.log("ArNS Name: ".concat(ARNS_NAME));
@@ -214,7 +269,7 @@ _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
           processId: arnsNameRecord.processId,
           signer: signer
         }); // Update the ANT record (assumes the JWK is a controller or owner)
-        _context.n = 13;
+        _context.n = 14;
         return ant.setRecord({
           undername: argv.undername,
           transactionId: txOrManifestId,
@@ -228,17 +283,17 @@ _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
             value: process.env.GITHUB_SHA
           }] : []))
         });
-      case 13:
+      case 14:
         console.log("Deployed TxId [".concat(txOrManifestId, "] to name [").concat(ARNS_NAME, "] for ANT [").concat(arnsNameRecord.processId, "] using undername [").concat(argv.undername, "]"));
-        _context.n = 15;
+        _context.n = 16;
         break;
-      case 14:
-        _context.p = 14;
+      case 15:
+        _context.p = 15;
         _t2 = _context.v;
         console.error('Deployment failed:', _t2);
         process.exit(1); // Exit with error code
-      case 15:
+      case 16:
         return _context.a(2);
     }
-  }, _callee, null, [[2, 14]]);
+  }, _callee, null, [[2, 15]]);
 }))();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "permaweb-deploy",
-	"version": "2.4.0",
+	"version": "2.5.0",
 	"description": "Permaweb App Deployment Package",
 	"main": "index.js",
 	"scripts": {

package/src/index.js

@@ -7,6 +7,7 @@ import mime from 'mime-types';
 
 import { ANT, AOProcess, ARIO, ARIO_MAINNET_PROCESS_ID, ARIO_TESTNET_PROCESS_ID, ArweaveSigner } from '@ar.io/sdk';
 import { connect } from '@permaweb/aoconnect';
+import { Readable } from 'node:stream';
 
 const arweaveTxIdRegex = /^[a-zA-Z0-9-_]{43}$/;
 
@@ -212,7 +213,32 @@ if (ARIO_PROCESS === 'mainnet') {
 					],
 				},
 			});
-			txOrManifestId = uploadResult.manifestResponse.id;
+			txOrManifestId = uploadResult.manifestResponse.id; //might replace now
+
+			// Make default folder paths work by adding extra path entries
+			const origPaths = uploadResult.manifest.paths;
+			const newPaths = {};
+			let replaceManifest = false;
+			for (const [key, value] of Object.entries(origPaths)) {
+				newPaths[key] = value;
+				if (key.endsWith('/index.html')) {
+					const newKey = key.replace(/\/index\.html$/, '');
+					newPaths[newKey] = value;
+					replaceManifest = true;
+				};
+			};
+			
+			if (replaceManifest) {
+				console.info('replacing manifest');
+				const newManifest = { ...uploadResult.manifest, paths: newPaths };
+				const buffer = Buffer.from(JSON.stringify(newManifest));
+				const { id } = await turbo.uploadFile({
+					fileStreamFactory: () => Readable.from(buffer),
+					fileSizeFactory: () => buffer.length,
+					dataItemOpts: { tags: [{ name: 'Content-Type', value: 'application/x.arweave-manifest+json' }] },
+				});
+				txOrManifestId = id;
+			}
 		}
 
 		console.log('-------------------- DEPLOY DETAILS --------------------');