permaweb-deploy 1.1.1 → 1.1.3

package/dist/index.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getTagValue = getTagValue;
+var _sdk = require("@ar.io/sdk");
 var _yargs = _interopRequireDefault(require("yargs"));
 var _helpers = require("yargs/helpers");
-var _sdk = _interopRequireDefault(require("@irys/sdk"));
-var _aoconnect = require("@permaweb/aoconnect");
+var _sdk2 = _interopRequireDefault(require("@irys/sdk"));
 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); }
@@ -34,7 +34,7 @@ function getTagValue(list, name) {
   return STORAGE.none;
 }
 _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-  var jwk, irys, txResult, response, _yield$result, Messages, responseAction;
+  var jwk, irys, txResult, signer, ant;
   return _regeneratorRuntime().wrap(function _callee$(_context) {
     while (1) switch (_context.prev = _context.next) {
       case 0:
@@ -52,65 +52,52 @@ _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 '@')
         jwk = JSON.parse(Buffer.from(DEPLOY_KEY, 'base64').toString('utf-8'));
-        irys = new _sdk["default"]({
+        irys = new _sdk2["default"]({
           url: 'https://turbo.ardrive.io',
           token: 'arweave',
           key: jwk
         });
-        _context.prev = 8;
+        irys.uploader.useChunking = false;
+        _context.prev = 9;
         console.log("Deploying ".concat(DEPLOY_FOLDER, " folder"));
-        _context.next = 12;
+        _context.next = 13;
         return irys.uploadFolder(DEPLOY_FOLDER, {
-          indexFile: 'index.html'
+          indexFile: 'index.html',
+          interactivePreflight: false,
+          logFunction: function logFunction(log) {
+            return console.log(log);
+          }
         });
-      case 12:
+      case 13:
         txResult = _context.sent;
-        _context.next = 15;
-        return (0, _aoconnect.message)({
-          process: ANT_PROCESS,
-          signer: (0, _aoconnect.createDataItemSigner)(jwk),
-          tags: [{
-            name: 'Action',
-            value: 'Set-Record'
-          }, {
-            name: 'Sub-Domain',
-            value: '@'
-          }, {
-            name: 'Transaction-Id',
-            value: txResult.id
-          }, {
-            name: 'TTL-Seconds',
-            value: '3600'
-          }]
-        });
-      case 15:
-        response = _context.sent;
-        _context.next = 18;
-        return (0, _aoconnect.result)({
-          message: response,
-          process: ANT_PROCESS
+        console.log("Bundle TxId [".concat(txResult.id, "]"));
+        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;
+        return ant.setRecord({
+          undername: '@',
+          transactionId: txResult.id,
+          ttlSeconds: 3600
+        }, {
+          name: 'GIT-HASH',
+          value: process.env.GITHUB_SHA
         });
-      case 18:
-        _yield$result = _context.sent;
-        Messages = _yield$result.Messages;
-        if (Messages && Messages.length > 0) {
-          responseAction = getTagValue(Messages[0].Tags, 'Action');
-          if (responseAction) {
-            if (responseAction === 'Set-Record-Notice') console.log("Deployed Tx [".concat(txResult.id, "] to ANT process [").concat(ANT_PROCESS, "]"));else if (responseAction === 'Invalid-Set-Record-Notice') console.log('Error deploying bundle');else console.error('Error deploying bundle');
-          }
-        } else {
-          console.error('Error deploying bundle');
-        }
-        _context.next = 26;
+      case 19:
+        console.log("Deployed TxId [".concat(txResult.id, "] to ANT [").concat(ANT_PROCESS, "]"));
+        _context.next = 25;
         break;
-      case 23:
-        _context.prev = 23;
-        _context.t0 = _context["catch"](8);
+      case 22:
+        _context.prev = 22;
+        _context.t0 = _context["catch"](9);
         console.error(_context.t0);
-      case 26:
+      case 25:
       case "end":
         return _context.stop();
     }
-  }, _callee, null, [[8, 23]]);
+  }, _callee, null, [[9, 22]]);
 }))();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "permaweb-deploy",
-	"version": "1.1.1",
+	"version": "1.1.3",
 	"description": "Permaweb app deployment package",
 	"main": "index.js",
 	"scripts": {
@@ -10,9 +10,9 @@
 		"permaweb-deploy": "./dist/index.js"
 	},
 	"dependencies": {
-		"@irys/sdk": "0.1.0-a1",
-		"@permaweb/aoconnect": "^0.0.56",
-		"yargs": "^17.7.2"
+		"@ar.io/sdk": "1.2.0",
+		"@irys/sdk": "0.1.1",
+		"yargs": "17.7.2"
 	},
 	"devDependencies": {
 		"@babel/cli": "^7.23.9",

package/src/index.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
+import { ANT, ArweaveSigner } from '@ar.io/sdk';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
 import Irys from '@irys/sdk';
-import { createDataItemSigner, message, result } from '@permaweb/aoconnect';
 
 const argv = yargs(hideBin(process.argv))
 	.option('ant-process', {
@@ -41,41 +41,37 @@ 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`);
 
 		const txResult = await irys.uploadFolder(DEPLOY_FOLDER, {
 			indexFile: 'index.html',
+			interactivePreflight: false,
+			logFunction: (log) => console.log(log),
 		});
 
-		const response = await message({
-			process: ANT_PROCESS,
-			signer: createDataItemSigner(jwk),
-			tags: [
-				{ name: 'Action', value: 'Set-Record' },
-				{ name: 'Sub-Domain', value: '@' },
-				{ name: 'Transaction-Id', value: txResult.id },
-				{ name: 'TTL-Seconds', value: '3600' },
-			],
-		});
+		console.log(`Bundle TxId [${txResult.id}]`);
 
-		const { Messages } = await result({ message: response, process: ANT_PROCESS });
-		
-		if (Messages && Messages.length > 0) {
-			const responseAction = getTagValue(Messages[0].Tags, 'Action');
-			if (responseAction) {
-				if (responseAction === 'Set-Record-Notice') console.log(`Deployed Tx [${txResult.id}] to ANT process [${ANT_PROCESS}]`);
-				else if (responseAction === 'Invalid-Set-Record-Notice') console.log('Error deploying bundle');
-				else console.error('Error deploying bundle');
-			}
-		}
-		else {
-			console.error('Error deploying bundle')
-		}
+		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,
+		})
+
+		console.log(`Deployed TxId [${txResult.id}] to ANT [${ANT_PROCESS}]`);
 	} catch (e) {
 		console.error(e);
 	}