permaweb-deploy 1.1.8 → 1.1.10

package/README.md

@@ -58,6 +58,12 @@ jobs:
           DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
 ```
 
+### To deploy to permaweb manually via cli
+
+```sh
+DEPLOY_KEY=$(base64 -i wallet.json) npx permaweb-deploy --ant-process <ANT_PROCESS>
+```
+
 ### Important Notes
 - **Security:** Always use a dedicated wallet for deployments to minimize risk.
 - **Wallet Key:** The wallet must be base64 encoded to be used in the deployment script.

package/dist/index.js

@@ -13,6 +13,12 @@ var _helpers = require("yargs/helpers");
 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 _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 _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 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 argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).option('ant-process', {
@@ -48,77 +54,63 @@ _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
   return _regeneratorRuntime().wrap(function _callee$(_context) {
     while (1) switch (_context.prev = _context.next) {
       case 0:
-        if (DEPLOY_KEY) {
-          _context.next = 3;
-          break;
+        if (!DEPLOY_KEY) {
+          console.error('DEPLOY_KEY not configured');
+          process.exit(1);
         }
-        console.error('DEPLOY_KEY not configured');
-        return _context.abrupt("return");
-      case 3:
-        if (ANT_PROCESS) {
-          _context.next = 6;
-          break;
+        if (!ANT_PROCESS) {
+          console.error('ANT_PROCESS not configured');
+          process.exit(1);
         }
-        console.error('ANT_PROCESS not configured');
-        return _context.abrupt("return");
-      case 6:
-        if (!(argv.deployFolder.length == 0)) {
-          _context.next = 9;
-          break;
+        if (argv.deployFolder.length == 0) {
+          console.error('deploy folder must not be empty');
+          process.exit(1);
         }
-        console.error('deploy folder must not be empty');
-        return _context.abrupt("return");
-      case 9:
-        if (!(argv.undername.length == 0)) {
-          _context.next = 12;
-          break;
+        if (argv.undername.length == 0) {
+          console.error('undername must not be empty');
+          process.exit(1);
         }
-        console.error('undername must not be empty');
-        return _context.abrupt("return");
-      case 12:
-        if (_fs["default"].existsSync(argv.deployFolder)) {
-          _context.next = 15;
-          break;
+        if (!_fs["default"].existsSync(argv.deployFolder)) {
+          console.error("deploy folder [".concat(argv.deployFolder, "] does not exist"));
+          process.exit(1);
         }
-        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'));
-        _context.prev = 16;
-        _context.next = 19;
+        _context.prev = 6;
+        _context.next = 9;
         return (0, _turbo["default"])(argv, jwk);
-      case 19:
+      case 9:
         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 = 24;
+        _context.next = 14;
         return ant.setRecord({
           undername: argv.undername,
           transactionId: manifestId,
           ttlSeconds: 3600
         }, {
           tags: [{
-            name: 'GIT-HASH',
-            value: process.env.GITHUB_SHA
-          }, {
             name: 'App-Name',
             value: 'Permaweb-Deploy'
-          }]
+          }].concat(_toConsumableArray(process.env.GITHUB_SHA ? [{
+            name: 'GIT-HASH',
+            value: process.env.GITHUB_SHA
+          }] : []))
         });
-      case 24:
+      case 14:
         console.log("Deployed TxId [".concat(manifestId, "] to ANT [").concat(ANT_PROCESS, "] using undername [").concat(argv.undername, "]"));
-        _context.next = 30;
+        _context.next = 21;
         break;
-      case 27:
-        _context.prev = 27;
-        _context.t0 = _context["catch"](16);
-        console.error(_context.t0);
-      case 30:
+      case 17:
+        _context.prev = 17;
+        _context.t0 = _context["catch"](6);
+        console.error('Deployment failed:', _context.t0);
+        process.exit(1); // Exit with error code
+      case 21:
       case "end":
         return _context.stop();
     }
-  }, _callee, null, [[16, 27]]);
+  }, _callee, null, [[6, 17]]);
 }))();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "permaweb-deploy",
-	"version": "1.1.8",
+	"version": "1.1.10",
 	"description": "Permaweb app deployment package",
 	"main": "index.js",
 	"scripts": {

package/src/index.js

@@ -44,27 +44,27 @@ export function getTagValue(list, name) {
 (async () => {
 	if (!DEPLOY_KEY) {
 		console.error('DEPLOY_KEY not configured');
-		return;
+		process.exit(1);
 	}
 
 	if (!ANT_PROCESS) {
 		console.error('ANT_PROCESS not configured');
-		return;
+		process.exit(1);
 	}
 
 	if (argv.deployFolder.length == 0) {
 		console.error('deploy folder must not be empty');
-		return;
+		process.exit(1);
 	}
 
 	if (argv.undername.length == 0) {
 		console.error('undername must not be empty');
-		return;
+		process.exit(1);
 	}
 
 	if (!fs.existsSync(argv.deployFolder)) {
 		console.error(`deploy folder [${argv.deployFolder}] does not exist`);
-		return;
+		process.exit(1);
 	}
 
 	let jwk = JSON.parse(Buffer.from(DEPLOY_KEY, 'base64').toString('utf-8'));
@@ -81,20 +81,21 @@ export function getTagValue(list, name) {
 				ttlSeconds: 3600,
 			},{
 				tags: [
-					{
-						name: 'GIT-HASH',
-						value: process.env.GITHUB_SHA,
-					},
 					{
 						name: 'App-Name',
 						value: 'Permaweb-Deploy',
 					},
+					...(process.env.GITHUB_SHA ? [{
+						name: 'GIT-HASH',
+						value: process.env.GITHUB_SHA,
+					}] : []),
 				]
 			}
 		);
 
 		console.log(`Deployed TxId [${manifestId}] to ANT [${ANT_PROCESS}] using undername [${argv.undername}]`);
 	} catch (e) {
-		console.error(e);
+		console.error('Deployment failed:', e);
+		process.exit(1); // Exit with error code
 	}
 })();