permaweb-deploy 1.1.5 → 1.1.7

package/dist/index.js

@@ -7,9 +7,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getTagValue = getTagValue;
 var _sdk = require("@ar.io/sdk");
+var _fs = _interopRequireDefault(require("fs"));
 var _yargs = _interopRequireDefault(require("yargs"));
 var _helpers = require("yargs/helpers");
-var _sdk2 = _interopRequireDefault(require("@irys/sdk"));
+var _turbo = _interopRequireDefault(require("./turbo"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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); }
@@ -19,8 +20,17 @@ var argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).option('a
   type: 'string',
   description: 'The ANT process',
   demandOption: true
+}).option('deploy-folder', {
+  alias: 'd',
+  type: 'string',
+  description: 'Folder to deploy.',
+  "default": './dist'
+}).option('undername', {
+  alias: 'u',
+  type: 'string',
+  description: 'ANT undername to update.',
+  "default": '@'
 }).argv;
-var DEPLOY_FOLDER = './dist';
 var DEPLOY_KEY = process.env.DEPLOY_KEY;
 var ANT_PROCESS = argv.antProcess;
 function getTagValue(list, name) {
@@ -34,7 +44,7 @@ function getTagValue(list, name) {
   return STORAGE.none;
 }
 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-  var jwk, irys, txResult, signer, ant;
+  var jwk, manifestId, signer, ant;
   return _regeneratorRuntime().wrap(function _callee$(_context) {
     while (1) switch (_context.prev = _context.next) {
       case 0:
@@ -52,52 +62,61 @@ _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         console.error('ANT_PROCESS not configured');
         return _context.abrupt("return");
       case 6:
-        // Should allow optional (subdomain input, default to '@')
+        if (!(argv.deployFolder.length == 0)) {
+          _context.next = 9;
+          break;
+        }
+        console.error('deploy folder must not be empty');
+        return _context.abrupt("return");
+      case 9:
+        if (!(argv.undername.length == 0)) {
+          _context.next = 12;
+          break;
+        }
+        console.error('undername must not be empty');
+        return _context.abrupt("return");
+      case 12:
+        if (_fs["default"].existsSync(argv.deployFolder)) {
+          _context.next = 15;
+          break;
+        }
+        console.error("deploy folder [".concat(argv.deployFolder, "] does not exist"));
+        return _context.abrupt("return");
+      case 15:
         jwk = JSON.parse(Buffer.from(DEPLOY_KEY, 'base64').toString('utf-8'));
-        irys = new _sdk2["default"]({
-          url: 'https://turbo.ardrive.io',
-          token: 'arweave',
-          key: jwk
-        });
-        irys.uploader.useChunking = false;
-        _context.prev = 9;
-        console.log("Deploying ".concat(DEPLOY_FOLDER, " folder"));
-        _context.next = 13;
-        return irys.uploadFolder(DEPLOY_FOLDER, {
-          indexFile: 'index.html',
-          interactivePreflight: false,
-          logFunction: function logFunction(log) {
-            return console.log(log);
-          }
-        });
-      case 13:
-        txResult = _context.sent;
-        console.log("Bundle TxId [".concat(txResult.id, "]"));
+        _context.prev = 16;
+        _context.next = 19;
+        return (0, _turbo["default"])(argv, jwk);
+      case 19:
+        manifestId = _context.sent;
         signer = new _sdk.ArweaveSigner(jwk);
         ant = _sdk.ANT.init({
           processId: ANT_PROCESS,
           signer: signer
         }); // Update the ANT record (assumes the JWK is a controller or owner)
-        _context.next = 19;
+        _context.next = 24;
         return ant.setRecord({
-          undername: '@',
-          transactionId: txResult.id,
+          undername: argv.undername,
+          transactionId: manifestId,
           ttlSeconds: 3600
         }, {
           name: 'GIT-HASH',
           value: process.env.GITHUB_SHA
+        }, {
+          name: 'App-Name',
+          value: 'Permaweb-Deploy'
         });
-      case 19:
-        console.log("Deployed TxId [".concat(txResult.id, "] to ANT [").concat(ANT_PROCESS, "]"));
-        _context.next = 25;
+      case 24:
+        console.log("Deployed TxId [".concat(manifestId, "] to ANT [").concat(ANT_PROCESS, "] using undername [").concat(argv.undername, "]"));
+        _context.next = 30;
         break;
-      case 22:
-        _context.prev = 22;
-        _context.t0 = _context["catch"](9);
+      case 27:
+        _context.prev = 27;
+        _context.t0 = _context["catch"](16);
         console.error(_context.t0);
-      case 25:
+      case 30:
       case "end":
         return _context.stop();
     }
-  }, _callee, null, [[9, 22]]);
+  }, _callee, null, [[16, 27]]);
 }))();

package/dist/turbo/index.js

@@ -0,0 +1,247 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = TurboDeploy;
+var _turboSdk = require("@ardrive/turbo-sdk");
+var _fs = _interopRequireDefault(require("fs"));
+var _mimeTypes = _interopRequireDefault(require("mime-types"));
+var _path = _interopRequireDefault(require("path"));
+var _stream = require("stream");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+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); }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+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 _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+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); }); }; }
+// Gets MIME types for each file to tag the upload
+function getContentType(_x) {
+  return _getContentType.apply(this, arguments);
+}
+function _getContentType() {
+  _getContentType = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(filePath) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", _mimeTypes["default"].lookup(filePath));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _getContentType.apply(this, arguments);
+}
+function TurboDeploy(_x2, _x3) {
+  return _TurboDeploy.apply(this, arguments);
+}
+function _TurboDeploy() {
+  _TurboDeploy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(argv, jwk) {
+    var turbo, deployFolder, newManifest, processFiles, _processFiles, uploadManifest, _uploadManifest, manifestId;
+    return _regeneratorRuntime().wrap(function _callee4$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _uploadManifest = function _uploadManifest3() {
+            _uploadManifest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(manifest) {
+              var manifestString, uploadResult;
+              return _regeneratorRuntime().wrap(function _callee3$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
+                  case 0:
+                    _context4.prev = 0;
+                    manifestString = JSON.stringify(manifest);
+                    _context4.next = 4;
+                    return turbo.uploadFile({
+                      fileStreamFactory: function fileStreamFactory() {
+                        return _stream.Readable.from(Buffer.from(manifestString));
+                      },
+                      fileSizeFactory: function fileSizeFactory() {
+                        return Buffer.byteLength(manifestString);
+                      },
+                      signal: AbortSignal.timeout(10000),
+                      dataItemOpts: {
+                        tags: [{
+                          name: 'Content-Type',
+                          value: 'application/x.arweave-manifest+json'
+                        }, {
+                          name: 'App-Name',
+                          value: 'Permaweb-Deploy'
+                        }]
+                      }
+                    });
+                  case 4:
+                    uploadResult = _context4.sent;
+                    return _context4.abrupt("return", uploadResult.id);
+                  case 8:
+                    _context4.prev = 8;
+                    _context4.t0 = _context4["catch"](0);
+                    console.error('Error uploading manifest:', _context4.t0);
+                    return _context4.abrupt("return", null);
+                  case 12:
+                  case "end":
+                    return _context4.stop();
+                }
+              }, _callee3, null, [[0, 8]]);
+            }));
+            return _uploadManifest.apply(this, arguments);
+          };
+          uploadManifest = function _uploadManifest2(_x5) {
+            return _uploadManifest.apply(this, arguments);
+          };
+          _processFiles = function _processFiles3() {
+            _processFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(dir) {
+              var files, _iterator, _step, _loop;
+              return _regeneratorRuntime().wrap(function _callee2$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
+                  case 0:
+                    files = _fs["default"].readdirSync(dir);
+                    _iterator = _createForOfIteratorHelper(files);
+                    _context3.prev = 2;
+                    _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
+                      var file, filePath, relativePath, fileSize, contentType, uploadResult;
+                      return _regeneratorRuntime().wrap(function _loop$(_context2) {
+                        while (1) switch (_context2.prev = _context2.next) {
+                          case 0:
+                            file = _step.value;
+                            _context2.prev = 1;
+                            filePath = _path["default"].join(dir, file);
+                            relativePath = _path["default"].relative(deployFolder, filePath);
+                            if (!_fs["default"].statSync(filePath).isDirectory()) {
+                              _context2.next = 9;
+                              break;
+                            }
+                            _context2.next = 7;
+                            return processFiles(filePath);
+                          case 7:
+                            _context2.next = 26;
+                            break;
+                          case 9:
+                            console.log("Uploading file: ".concat(relativePath));
+                            _context2.prev = 10;
+                            fileSize = _fs["default"].statSync(filePath).size;
+                            _context2.next = 14;
+                            return getContentType(filePath);
+                          case 14:
+                            contentType = _context2.sent;
+                            _context2.next = 17;
+                            return turbo.uploadFile({
+                              fileStreamFactory: function fileStreamFactory() {
+                                return _fs["default"].createReadStream(filePath);
+                              },
+                              fileSizeFactory: function fileSizeFactory() {
+                                return fileSize;
+                              },
+                              signal: AbortSignal.timeout(10000),
+                              // cancel the upload after 10 seconds
+                              dataItemOpts: {
+                                tags: [{
+                                  name: 'Content-Type',
+                                  value: contentType
+                                }, {
+                                  name: 'App-Name',
+                                  value: 'Permaweb-Deploy'
+                                }]
+                              }
+                            });
+                          case 17:
+                            uploadResult = _context2.sent;
+                            console.log("Uploaded ".concat(relativePath, " with id:"), uploadResult.id);
+                            // adds uploaded file txId to the new manifest json
+                            newManifest.paths[relativePath] = {
+                              id: uploadResult.id
+                            };
+                            if (file === '404.html') {
+                              // sets manifest fallback to 404.html if found
+                              newManifest.fallback.id = uploadResult.id;
+                            }
+                            _context2.next = 26;
+                            break;
+                          case 23:
+                            _context2.prev = 23;
+                            _context2.t0 = _context2["catch"](10);
+                            console.error("Error uploading file ".concat(relativePath, ":"), _context2.t0);
+                          case 26:
+                            _context2.next = 31;
+                            break;
+                          case 28:
+                            _context2.prev = 28;
+                            _context2.t1 = _context2["catch"](1);
+                            console.error('ERROR:', _context2.t1);
+                          case 31:
+                          case "end":
+                            return _context2.stop();
+                        }
+                      }, _loop, null, [[1, 28], [10, 23]]);
+                    });
+                    _iterator.s();
+                  case 5:
+                    if ((_step = _iterator.n()).done) {
+                      _context3.next = 9;
+                      break;
+                    }
+                    return _context3.delegateYield(_loop(), "t0", 7);
+                  case 7:
+                    _context3.next = 5;
+                    break;
+                  case 9:
+                    _context3.next = 14;
+                    break;
+                  case 11:
+                    _context3.prev = 11;
+                    _context3.t1 = _context3["catch"](2);
+                    _iterator.e(_context3.t1);
+                  case 14:
+                    _context3.prev = 14;
+                    _iterator.f();
+                    return _context3.finish(14);
+                  case 17:
+                  case "end":
+                    return _context3.stop();
+                }
+              }, _callee2, null, [[2, 11, 14, 17]]);
+            }));
+            return _processFiles.apply(this, arguments);
+          };
+          processFiles = function _processFiles2(_x4) {
+            return _processFiles.apply(this, arguments);
+          };
+          turbo = _turboSdk.TurboFactory.authenticated({
+            privateKey: jwk
+          });
+          deployFolder = argv.deployFolder; //Uses Arweave manifest version 0.2.0, which supports fallbacks
+          newManifest = {
+            manifest: 'arweave/paths',
+            version: '0.2.0',
+            index: {
+              path: 'index.html'
+            },
+            fallback: {},
+            paths: {}
+          }; // starts processing files in the selected directory
+          _context5.next = 9;
+          return processFiles(deployFolder);
+        case 9:
+          if (!newManifest.fallback.id) {
+            // if no 404.html file is found, manifest fallback is set to the txId of index.html
+            newManifest.fallback.id = newManifest.paths['index.html'].id;
+          }
+          _context5.next = 12;
+          return uploadManifest(newManifest);
+        case 12:
+          manifestId = _context5.sent;
+          if (!manifestId) {
+            _context5.next = 16;
+            break;
+          }
+          console.log("Manifest uploaded with Id: ".concat(manifestId));
+          return _context5.abrupt("return", manifestId);
+        case 16:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee4);
+  }));
+  return _TurboDeploy.apply(this, arguments);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "permaweb-deploy",
-	"version": "1.1.5",
+	"version": "1.1.7",
 	"description": "Permaweb app deployment package",
 	"main": "index.js",
 	"scripts": {
@@ -10,8 +10,9 @@
 		"permaweb-deploy": "./dist/index.js"
 	},
 	"dependencies": {
-		"@ar.io/sdk": "1.2.0",
-		"@irys/sdk": "0.1.1",
+		"@ar.io/sdk": "^1.2.2",
+		"@ardrive/turbo-sdk": "^1.9.0",
+		"mime-types": "^2.1.35",
 		"yargs": "17.7.2"
 	},
 	"devDependencies": {

package/src/index.js

@@ -1,10 +1,11 @@
 #!/usr/bin/env node
 
 import { ANT, ArweaveSigner } from '@ar.io/sdk';
+import fs from 'fs';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
-import Irys from '@irys/sdk';
+import TurboDeploy from './turbo';
 
 const argv = yargs(hideBin(process.argv))
 	.option('ant-process', {
@@ -13,9 +14,19 @@ const argv = yargs(hideBin(process.argv))
 		description: 'The ANT process',
 		demandOption: true,
 	})
-	.argv;
+	.option('deploy-folder', {
+		alias: 'd',
+		type: 'string',
+		description: 'Folder to deploy.',
+		default: './dist',
+	})
+	.option('undername', {
+		alias: 'u',
+		type: 'string',
+		description: 'ANT undername to update.',
+		default: '@',
+	}).argv;
 
-const DEPLOY_FOLDER = './dist';
 const DEPLOY_KEY = process.env.DEPLOY_KEY;
 const ANT_PROCESS = argv.antProcess;
 
@@ -41,37 +52,45 @@ export function getTagValue(list, name) {
 		return;
 	}
 
-	// Should allow optional (subdomain input, default to '@')
-
-	let jwk = JSON.parse(Buffer.from(DEPLOY_KEY, 'base64').toString('utf-8'));
-	
-	const irys = new Irys({ url: 'https://turbo.ardrive.io', token: 'arweave', key: jwk });
-	irys.uploader.useChunking = false;
-
-	try {
-		console.log(`Deploying ${DEPLOY_FOLDER} folder`);
+	if (argv.deployFolder.length == 0) {
+		console.error('deploy folder must not be empty');
+		return;
+	}
 
-		const txResult = await irys.uploadFolder(DEPLOY_FOLDER, {
-			indexFile: 'index.html',
-			interactivePreflight: false,
-			logFunction: (log) => console.log(log),
-		});
+	if (argv.undername.length == 0) {
+		console.error('undername must not be empty');
+		return;
+	}
 
-		console.log(`Bundle TxId [${txResult.id}]`);
+	if (!fs.existsSync(argv.deployFolder)) {
+		console.error(`deploy folder [${argv.deployFolder}] does not exist`);
+		return;
+	}
 
+	let jwk = JSON.parse(Buffer.from(DEPLOY_KEY, 'base64').toString('utf-8'));
+	try {
+		const manifestId = await TurboDeploy(argv, jwk);
 		const signer = new ArweaveSigner(jwk);
 		const ant = ANT.init({ processId: ANT_PROCESS, signer });
 
 		// Update the ANT record (assumes the JWK is a controller or owner)
-		await ant.setRecord({
-			undername: '@',
-			transactionId: txResult.id,
-			ttlSeconds: 3600,
-		}, {
-			name: 'GIT-HASH', value: process.env.GITHUB_SHA,
-		})
+		await ant.setRecord(
+			{
+				undername: argv.undername,
+				transactionId: manifestId,
+				ttlSeconds: 3600,
+			},
+			{
+				name: 'GIT-HASH',
+				value: process.env.GITHUB_SHA,
+			},
+			{
+				name: 'App-Name',
+				value: 'Permaweb-Deploy',
+			}
+		);
 
-		console.log(`Deployed TxId [${txResult.id}] to ANT [${ANT_PROCESS}]`);
+		console.log(`Deployed TxId [${manifestId}] to ANT [${ANT_PROCESS}] using undername [${argv.undername}]`);
 	} catch (e) {
 		console.error(e);
 	}

package/src/turbo/index.js

@@ -0,0 +1,111 @@
+import { TurboFactory } from '@ardrive/turbo-sdk';
+import fs from 'fs';
+import mime from 'mime-types';
+import path from 'path';
+import { Readable } from 'stream';
+
+// Gets MIME types for each file to tag the upload
+async function getContentType(filePath) {
+	return mime.lookup(filePath);
+}
+
+export default async function TurboDeploy(argv, jwk) {
+	const turbo = TurboFactory.authenticated({ privateKey: jwk });
+
+	const deployFolder = argv.deployFolder;
+	//Uses Arweave manifest version 0.2.0, which supports fallbacks
+	let newManifest = {
+		manifest: 'arweave/paths',
+		version: '0.2.0',
+		index: { path: 'index.html' },
+		fallback: {},
+		paths: {},
+	};
+
+	async function processFiles(dir) {
+		const files = fs.readdirSync(dir);
+
+		for (const file of files) {
+			try {
+				const filePath = path.join(dir, file);
+				const relativePath = path.relative(deployFolder, filePath);
+
+				if (fs.statSync(filePath).isDirectory()) {
+					// recursively process all files in a directory
+					await processFiles(filePath);
+				} else {
+					console.log(`Uploading file: ${relativePath}`);
+					try {
+						const fileSize = fs.statSync(filePath).size;
+						const contentType = await getContentType(filePath);
+						const uploadResult = await turbo.uploadFile({
+							fileStreamFactory: () => fs.createReadStream(filePath),
+							fileSizeFactory: () => fileSize,
+							signal: AbortSignal.timeout(10_000), // cancel the upload after 10 seconds
+							dataItemOpts: {
+								tags: [
+									{ name: 'Content-Type', value: contentType },
+									{ name: 'App-Name', value: 'Permaweb-Deploy' },
+								],
+							},
+						});
+
+						console.log(`Uploaded ${relativePath} with id:`, uploadResult.id);
+						// adds uploaded file txId to the new manifest json
+						newManifest.paths[relativePath] = { id: uploadResult.id };
+
+						if (file === '404.html') {
+							// sets manifest fallback to 404.html if found
+							newManifest.fallback.id = uploadResult.id;
+						}
+					} catch (err) {
+						console.error(`Error uploading file ${relativePath}:`, err);
+					}
+				}
+			} catch (err) {
+				console.error('ERROR:', err);
+			}
+		}
+	}
+
+	async function uploadManifest(manifest) {
+		try {
+			const manifestString = JSON.stringify(manifest);
+			const uploadResult = await turbo.uploadFile({
+				fileStreamFactory: () => Readable.from(Buffer.from(manifestString)),
+				fileSizeFactory: () => Buffer.byteLength(manifestString),
+				signal: AbortSignal.timeout(10_000),
+				dataItemOpts: {
+					tags: [
+						{
+							name: 'Content-Type',
+							value: 'application/x.arweave-manifest+json',
+						},
+						{
+							name: 'App-Name',
+							value: 'Permaweb-Deploy',
+						},
+					],
+				},
+			});
+			return uploadResult.id;
+		} catch (error) {
+			console.error('Error uploading manifest:', error);
+			return null;
+		}
+	}
+
+	// starts processing files in the selected directory
+	await processFiles(deployFolder);
+
+	if (!newManifest.fallback.id) {
+		// if no 404.html file is found, manifest fallback is set to the txId of index.html
+		newManifest.fallback.id = newManifest.paths['index.html'].id;
+	}
+
+	const manifestId = await uploadManifest(newManifest);
+	if (manifestId) {
+		console.log(`Manifest uploaded with Id: ${manifestId}`);
+		return manifestId;
+	}
+}