permaweb-deploy 2.0.2 → 2.2.0

package/.eslintrc.js

@@ -22,7 +22,7 @@ module.exports = {
 					{
 						groups: [
 							['^react', '^@?\\w'],
-							['^arweave', '@irys/sdk', '@permaweb/aoconnect', '^@?\\w'],
+							['^arweave', '@ar.io/sdk', '@ardrive/turbo-sdk', '@permaweb/aoconnect', '^@?\\w'],
 							['^\\u0000'],
 							['^\\.\\.(?!/?$)', '^\\.\\./?$'],
 							['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],

package/README.md

@@ -1,28 +1,61 @@
-# Permaweb deployment package
+# Permaweb Deployment Package
 
-Inspired by the [cookbook github action deployment guide](https://cookbook.arweave.dev/guides/deployment/github-action.html), `permaweb-deploy` is a Node.js command-line tool designed to streamline the deployment of JavaScript bundles to the permaweb using Arweave. It simplifies the process by bundling JS code, deploying it as a transaction to Arweave, and updating ArNS (Arweave Name Service) with the transaction ID.
+Inspired by the [cookbook github action deployment guide](https://cookbook.arweave.dev/guides/deployment/github-action.html), `permaweb-deploy` is a Node.js command-line tool designed to streamline the deployment of web applications to the permaweb using Arweave. It simplifies the process by uploading your build folder, creating Arweave manifests, and updating ArNS (Arweave Name Service) records via ANT (Arweave Name Token) with the transaction ID.
 
 ### Features
-- **Bundle Deployment:** Automatically bundles your JS code and deploys it to Arweave.
-- **ArNS Update:** Updates ArNS with the new transaction ID each time new content is deployed.
-- **Automated Workflow:** Integrates with GitHub Actions for continuous deployment directly from your repository.
+- **Turbo SDK Integration:** Uses Turbo SDK for fast, reliable file uploads to Arweave
+- **Arweave Manifest v0.2.0:** Creates manifests with fallback support for SPAs
+- **ArNS Updates:** Updates ArNS records via ANT with new transaction IDs and metadata
+- **Automated Workflow:** Integrates with GitHub Actions for continuous deployment
+- **Git Hash Tagging:** Automatically tags deployments with Git commit hashes
+- **404 Fallback Detection:** Automatically detects and sets 404.html as fallback
+- **Network Support:** Supports mainnet, testnet, and custom ARIO process IDs
 
 ### Installation
+
 Install the package using npm:
+
 ```bash
 npm install permaweb-deploy
 ```
 
+For development use:
+```bash
+npm install permaweb-deploy --save-dev
+```
+
+For Yarn users:
+```bash
+yarn add permaweb-deploy --dev --ignore-engines
+```
+
 ### Prerequisites
-Before using `permaweb-deploy`, you must:
-1. Encode your Arweave wallet key in base64 format and set it as a GitHub secret:
 
+Before using `permaweb-deploy`, you must:
+1. **Arweave Wallet:** Have an Arweave wallet with Turbo Credits for uploading
+2. **ArNS Name:** Own or control an ArNS name (which has an associated ANT process)
+3. **Wallet Encoding:** Encode your Arweave wallet key in base64 format:
    ```bash
    base64 -i wallet.json | pbcopy
    ```
-3. Ensure that the secret name for the encoded wallet is `DEPLOY_KEY`.
+4. **GitHub Secret:** Set the encoded wallet as a GitHub secret named `DEPLOY_KEY`
+
+⚠️ **Important:** Use a dedicated wallet for deployments to minimize security risks. Ensure your wallet has sufficient Turbo Credits for uploads.
+
+### CLI Options
+```bash
+permaweb-deploy [options]
+```
+
+| Option | Alias | Description | Default | Required |
+|--------|-------|-------------|---------|----------|
+| `--arns-name` | `-n` | ArNS name for deployment | - | ✅ |
+| `--ario-process` | `-p` | ARIO process ID or "mainnet"/"testnet" | `mainnet` | ❌ |
+| `--deploy-folder` | `-d` | Folder to deploy | `./dist` | ❌ |
+| `--undername` | `-u` | ANT undername to update | `@` | ❌ |
 
 ### Usage
+
 To deploy your application, ensure you have a build script and a deployment script in your `package.json`:
 
 ```json
@@ -32,10 +65,55 @@ To deploy your application, ensure you have a build script and a deployment scri
 }
 ```
 
-Replace `<ARNS_NAME>` with your ArNS name.
+**Example with custom options:**
+```bash
+permaweb-deploy --arns-name "your-arns-name" --deploy-folder "./build" --undername "app"
+```
+
+Replace `<ARNS_NAME>` with your ArNS name. You can also specify testnet, mainnet, and custom process IDs for the ARIO process to use.
+
+**Mainnet (default) config:**
+```json
+"scripts": {
+    "build": "your-build-command",
+    "deploy-main": "npm run build && permaweb-deploy --arns-name <ARNS_NAME> --ario-process mainnet"
+}
+```
+
+**Testnet config:**
+```json
+"scripts": {
+    "build": "your-build-command",
+    "deploy-main": "npm run build && permaweb-deploy --arns-name <ARNS_NAME> --ario-process testnet"
+}
+```
+
+**Custom process ID config:**
+```json
+"scripts": {
+    "build": "your-build-command",
+    "deploy-main": "npm run build && permaweb-deploy --arns-name <ARNS_NAME> --ario-process GaQrvEMKBpkjofgnBi_B3IgIDmY_XYelVLB6GcRGrHc"
+}
+```
+
+### Manual CLI Deployment
+```bash
+DEPLOY_KEY=$(base64 -i wallet.json) npx permaweb-deploy --arns-name <ARNS_NAME>
+```
+
+### Technical Details
+- **Upload Service:** Uses Turbo SDK for fast, reliable file uploads to Arweave
+- **Manifest Format:** Creates Arweave manifests using version 0.2.0 specification
+- **Fallback Support:** Automatically detects `404.html` and sets it as fallback, otherwise uses `index.html`
+- **Upload Timeout:** 10-second timeout per file upload for reliability
+- **ArNS Record TTL:** Sets 3600 seconds (1 hour) TTL for ArNS records via ANT
+- **Deployment Tags:** Automatically adds `App-Name: Permaweb-Deploy` and Git hash tags
+- **Network Support:** Supports mainnet, testnet, and custom ARIO process IDs
 
 ### GitHub Actions Workflow
+
 To automate the deployment, set up a GitHub Actions workflow as follows:
+
 ```yaml
 name: publish
 
@@ -48,8 +126,8 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 20.x
       - run: npm install
@@ -58,13 +136,26 @@ jobs:
           DEPLOY_KEY: ${{ secrets.DEPLOY_KEY }}
 ```
 
-### To deploy to permaweb manually via cli
+### Security & Best Practices
+- **Dedicated Wallet:** Always use a dedicated wallet for deployments to minimize security risks
+- **Wallet Encoding:** The wallet must be base64 encoded to be used in the deployment script
+- **ArNS Name:** The ArNS Name must be passed so that the ANT Process can be resolved to update the target undername or root record
+- **Turbo Credits:** Ensure your wallet has sufficient Turbo Credits before deployment
+- **Secret Management:** Keep your `DEPLOY_KEY` secret secure and never commit it to your repository
+- **Build Security:** Always check your build for exposed environmental secrets before deployment, as data on Arweave is permanent
 
-```sh
-DEPLOY_KEY=$(base64 -i wallet.json) npx permaweb-deploy --arns-name <ARNS_NAME>
-```
+### Troubleshooting
+- **Error: "ARNS_NAME not configured":** Ensure you're passing the `--arns-name` flag with a valid ArNS name
+- **Error: "DEPLOY_KEY not configured":** Verify your base64 encoded wallet is set as the `DEPLOY_KEY` environment variable
+- **Error: "deploy-folder does not exist":** Check that your build folder exists and the path is correct
+- **Error: "deploy-file does not exist":** Check that your build file exists and the path is correct
+- **Error: "ARNS name does not exist":** Verify the ArNS name is correct and exists in the specified network
+- **Upload timeouts:** Files have a 10-second upload timeout. Large files may fail and require optimization
+- **Insufficient Turbo Credits:** Ensure your wallet has enough Turbo Credits for the deployment
 
-### 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.
-- **ARNS Name:** The ArNS Name must be passed in so that the ANT Process can be resolved to update the target undername or root record.
+### Dependencies
+- **@ar.io/sdk:** - For ANT operations and ArNS management
+- **@ardrive/turbo-sdk:** - For fast file uploads to Arweave
+- **@permaweb/aoconnect:** - For AO network connectivity
+- **mime-types:** - For automatic content type detection
+- **yargs:** - For CLI argument parsing

package/dist/index.js

@@ -1,18 +1,16 @@
 #!/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); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-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 _turbo = _interopRequireDefault(require("./turbo"));
+var _sdk = require("@ar.io/sdk");
+var _turboSdk = require("@ardrive/turbo-sdk");
+var _aoconnect = require("@permaweb/aoconnect");
+var _turbo = 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 _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; } }
@@ -21,7 +19,14 @@ function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(
 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('arns-name', {
+var arweaveTxIdRegex = /^[a-zA-Z0-9-_]{43}$/;
+var argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).option('ario-process', {
+  alias: 'p',
+  type: 'string',
+  description: 'The ARIO process to use',
+  demandOption: true,
+  "default": _sdk.ARIO_MAINNET_PROCESS_ID
+}).option('arns-name', {
   alias: 'n',
   type: 'string',
   description: 'The ARNS name',
@@ -31,6 +36,10 @@ var argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).option('a
   type: 'string',
   description: 'Folder to deploy.',
   "default": './dist'
+}).option('deploy-file', {
+  alias: 'f',
+  type: 'string',
+  description: 'File to deploy.'
 }).option('undername', {
   alias: 'u',
   type: 'string',
@@ -39,21 +48,21 @@ var argv = (0, _yargs["default"])((0, _helpers.hideBin)(process.argv)).option('a
 }).argv;
 var DEPLOY_KEY = process.env.DEPLOY_KEY;
 var ARNS_NAME = argv.arnsName;
-function getTagValue(list, name) {
-  for (var i = 0; i < list.length; i++) {
-    if (list[i]) {
-      if (list[i].name === name) {
-        return list[i].value;
-      }
-    }
-  }
-  return STORAGE.none;
+var ARIO_PROCESS = argv.arioProcess;
+if (ARIO_PROCESS === 'mainnet') {
+  ARIO_PROCESS = _sdk.ARIO_MAINNET_PROCESS_ID;
+} else if (ARIO_PROCESS === 'testnet') {
+  ARIO_PROCESS = _sdk.ARIO_TESTNET_PROCESS_ID;
 }
-_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-  var jwk, ario, arnsNameRecord, manifestId, signer, ant;
-  return _regeneratorRuntime().wrap(function _callee$(_context) {
-    while (1) switch (_context.prev = _context.next) {
+_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+  var jwk, ario, arnsNameRecord, txId, turbo, signer, ant, _t;
+  return _regenerator().w(function (_context) {
+    while (1) switch (_context.n) {
       case 0:
+        if (!ARIO_PROCESS || !arweaveTxIdRegex.test(ARIO_PROCESS)) {
+          console.error('ARIO_PROCESS must be a valid Arweave transaction ID, or "mainnet" or "testnet"');
+          process.exit(1);
+        }
         if (!DEPLOY_KEY) {
           console.error('DEPLOY_KEY not configured');
           process.exit(1);
@@ -62,43 +71,67 @@ _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
           console.error('ARNS_NAME not configured');
           process.exit(1);
         }
-        if (argv.deployFolder.length == 0) {
-          console.error('deploy folder must not be empty');
+        if (argv.deployFile && !_fs["default"].existsSync(argv.deployFile)) {
+          console.error("deploy-file [".concat(argv.deployFolder, "] does not exist"));
           process.exit(1);
+        } else {
+          if (!_fs["default"].existsSync(argv.deployFolder)) {
+            console.error("deploy-folder [".concat(argv.deployFolder, "] does not exist"));
+            process.exit(1);
+          }
         }
-        if (argv.undername.length == 0) {
-          console.error('undername must not be empty');
-          process.exit(1);
-        }
-        if (!_fs["default"].existsSync(argv.deployFolder)) {
-          console.error("deploy folder [".concat(argv.deployFolder, "] does not exist"));
+        if (argv.undername.length === 0) {
+          console.error('undername must be set');
           process.exit(1);
         }
         jwk = JSON.parse(Buffer.from(DEPLOY_KEY, 'base64').toString('utf-8'));
-        ario = _sdk.ARIO.init();
-        _context.next = 9;
+        ario = _sdk.ARIO.init({
+          process: new _sdk.AOProcess({
+            processId: ARIO_PROCESS,
+            ao: (0, _aoconnect.connect)({
+              MODE: 'legacy',
+              CU_URL: 'https://cu.ardrive.io'
+            })
+          })
+        });
+        _context.n = 1;
         return ario.getArNSRecord({
           name: ARNS_NAME
         })["catch"](function (e) {
           console.error("ARNS name [".concat(ARNS_NAME, "] does not exist"));
           process.exit(1);
         });
-      case 9:
-        arnsNameRecord = _context.sent;
-        _context.prev = 10;
-        _context.next = 13;
-        return (0, _turbo["default"])(argv, jwk);
-      case 13:
-        manifestId = _context.sent;
+      case 1:
+        arnsNameRecord = _context.v;
+        _context.p = 2;
+        if (!argv.deployFile) {
+          _context.n = 4;
+          break;
+        }
+        turbo = _turboSdk.TurboFactory.authenticated({
+          privateKey: jwk
+        });
+        _context.n = 3;
+        return (0, _turbo.uploadFile)(argv.deployFile, turbo);
+      case 3:
+        txId = _context.v.id;
+        _context.n = 6;
+        break;
+      case 4:
+        _context.n = 5;
+        return (0, _turbo.uploadDirectory)(argv, jwk);
+      case 5:
+        txId = _context.v;
+      case 6:
         signer = new _sdk.ArweaveSigner(jwk);
         ant = _sdk.ANT.init({
           processId: arnsNameRecord.processId,
           signer: signer
         }); // Update the ANT record (assumes the JWK is a controller or owner)
-        _context.next = 18;
+        _context.n = 7;
         return ant.setRecord({
           undername: argv.undername,
-          transactionId: manifestId,
+          transactionId: txId,
           ttlSeconds: 3600
         }, {
           tags: [{
@@ -109,18 +142,17 @@ _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
             value: process.env.GITHUB_SHA
           }] : []))
         });
-      case 18:
-        console.log("Deployed TxId [".concat(manifestId, "] to name [").concat(ARNS_NAME, "] for ANT [").concat(arnsNameRecord.processId, "] using undername [").concat(argv.undername, "]"));
-        _context.next = 25;
+      case 7:
+        console.log("Deployed TxId [".concat(txId, "] to name [").concat(ARNS_NAME, "] for ANT [").concat(arnsNameRecord.processId, "] using undername [").concat(argv.undername, "]"));
+        _context.n = 9;
         break;
-      case 21:
-        _context.prev = 21;
-        _context.t0 = _context["catch"](10);
-        console.error('Deployment failed:', _context.t0);
+      case 8:
+        _context.p = 8;
+        _t = _context.v;
+        console.error('Deployment failed:', _t);
         process.exit(1); // Exit with error code
-      case 25:
-      case "end":
-        return _context.stop();
+      case 9:
+        return _context.a(2);
     }
-  }, _callee, null, [[10, 21]]);
+  }, _callee, null, [[2, 8]]);
 }))();

package/dist/turbo/index.js

@@ -1,20 +1,21 @@
 "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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = TurboDeploy;
-var _turboSdk = require("@ardrive/turbo-sdk");
+exports.uploadDirectory = uploadDirectory;
+exports.uploadFile = uploadFile;
 var _fs = _interopRequireDefault(require("fs"));
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
 var _path = _interopRequireDefault(require("path"));
 var _stream = require("stream");
+var _turboSdk = require("@ardrive/turbo-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 _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 _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 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
@@ -22,24 +23,72 @@ function getContentType(filePath) {
   var res = _mimeTypes["default"].lookup(filePath);
   return res || 'application/octet-stream';
 }
-function TurboDeploy(_x, _x2) {
-  return _TurboDeploy.apply(this, arguments);
+function uploadFile(_x, _x2) {
+  return _uploadFile.apply(this, arguments);
+}
+function _uploadFile() {
+  _uploadFile = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(path, turbo) {
+    var fileSize, contentType, uploadResult, _t;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          console.log("Uploading file: ".concat(path, "..."));
+          _context.p = 1;
+          fileSize = _fs["default"].statSync(path).size;
+          contentType = getContentType(path);
+          _context.n = 2;
+          return turbo.uploadFile({
+            fileStreamFactory: function fileStreamFactory() {
+              return _fs["default"].createReadStream(path);
+            },
+            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 2:
+          uploadResult = _context.v;
+          console.log("Uploaded ".concat(path, " with id:"), uploadResult.id);
+          return _context.a(2, uploadResult);
+        case 3:
+          _context.p = 3;
+          _t = _context.v;
+          console.error("Error uploading file ".concat(path, ":"), _t);
+        case 4:
+          return _context.a(2);
+      }
+    }, _callee, null, [[1, 3]]);
+  }));
+  return _uploadFile.apply(this, arguments);
+}
+function uploadDirectory(_x3, _x4) {
+  return _uploadDirectory.apply(this, arguments);
 }
-function _TurboDeploy() {
-  _TurboDeploy = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(argv, jwk) {
+function _uploadDirectory() {
+  _uploadDirectory = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(argv, jwk) {
     var turbo, deployFolder, newManifest, processFiles, _processFiles, uploadManifest, _uploadManifest, manifestId;
-    return _regeneratorRuntime().wrap(function _callee3$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    return _regenerator().w(function (_context4) {
+      while (1) switch (_context4.n) {
         case 0:
           _uploadManifest = function _uploadManifest3() {
-            _uploadManifest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(manifest) {
-              var manifestString, uploadResult;
-              return _regeneratorRuntime().wrap(function _callee2$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
+            _uploadManifest = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(manifest) {
+              var manifestString, uploadResult, _t4;
+              return _regenerator().w(function (_context3) {
+                while (1) switch (_context3.n) {
                   case 0:
-                    _context3.prev = 0;
+                    _context3.p = 0;
                     manifestString = JSON.stringify(manifest);
-                    _context3.next = 4;
+                    _context3.n = 1;
                     return turbo.uploadFile({
                       fileStreamFactory: function fileStreamFactory() {
                         return _stream.Readable.from(Buffer.from(manifestString));
@@ -58,143 +107,98 @@ function _TurboDeploy() {
                         }]
                       }
                     });
-                  case 4:
-                    uploadResult = _context3.sent;
-                    return _context3.abrupt("return", uploadResult.id);
-                  case 8:
-                    _context3.prev = 8;
-                    _context3.t0 = _context3["catch"](0);
-                    console.error('Error uploading manifest:', _context3.t0);
-                    return _context3.abrupt("return", null);
-                  case 12:
-                  case "end":
-                    return _context3.stop();
+                  case 1:
+                    uploadResult = _context3.v;
+                    return _context3.a(2, uploadResult.id);
+                  case 2:
+                    _context3.p = 2;
+                    _t4 = _context3.v;
+                    console.error('Error uploading manifest:', _t4);
+                    return _context3.a(2, null);
                 }
-              }, _callee2, null, [[0, 8]]);
+              }, _callee3, null, [[0, 2]]);
             }));
             return _uploadManifest.apply(this, arguments);
           };
-          uploadManifest = function _uploadManifest2(_x4) {
+          uploadManifest = function _uploadManifest2(_x6) {
             return _uploadManifest.apply(this, arguments);
           };
           _processFiles = function _processFiles3() {
-            _processFiles = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dir) {
-              var files, _iterator, _step, _loop;
-              return _regeneratorRuntime().wrap(function _callee$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
+            _processFiles = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(dir) {
+              var files, _iterator, _step, file, filePath, relativePath, uploadResult, _t2, _t3;
+              return _regenerator().w(function (_context2) {
+                while (1) switch (_context2.n) {
                   case 0:
                     files = _fs["default"].readdirSync(dir);
                     _iterator = _createForOfIteratorHelper(files);
-                    _context2.prev = 2;
-                    _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-                      var file, filePath, relativePath, fileSize, contentType, uploadResult;
-                      return _regeneratorRuntime().wrap(function _loop$(_context) {
-                        while (1) switch (_context.prev = _context.next) {
-                          case 0:
-                            file = _step.value;
-                            _context.prev = 1;
-                            filePath = _path["default"].join(dir, file);
-                            relativePath = _path["default"].relative(deployFolder, filePath);
-                            if (!_fs["default"].statSync(filePath).isDirectory()) {
-                              _context.next = 9;
-                              break;
-                            }
-                            _context.next = 7;
-                            return processFiles(filePath);
-                          case 7:
-                            _context.next = 24;
-                            break;
-                          case 9:
-                            console.log("Uploading file: ".concat(relativePath));
-                            _context.prev = 10;
-                            fileSize = _fs["default"].statSync(filePath).size;
-                            contentType = getContentType(filePath);
-                            _context.next = 15;
-                            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 15:
-                            uploadResult = _context.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;
-                            }
-                            _context.next = 24;
-                            break;
-                          case 21:
-                            _context.prev = 21;
-                            _context.t0 = _context["catch"](10);
-                            console.error("Error uploading file ".concat(relativePath, ":"), _context.t0);
-                          case 24:
-                            _context.next = 29;
-                            break;
-                          case 26:
-                            _context.prev = 26;
-                            _context.t1 = _context["catch"](1);
-                            console.error('ERROR:', _context.t1);
-                          case 29:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }, _loop, null, [[1, 26], [10, 21]]);
-                    });
+                    _context2.p = 1;
                     _iterator.s();
-                  case 5:
+                  case 2:
                     if ((_step = _iterator.n()).done) {
-                      _context2.next = 9;
+                      _context2.n = 10;
                       break;
                     }
-                    return _context2.delegateYield(_loop(), "t0", 7);
+                    file = _step.value;
+                    _context2.p = 3;
+                    filePath = _path["default"].join(dir, file);
+                    relativePath = _path["default"].relative(deployFolder, filePath);
+                    if (!_fs["default"].statSync(filePath).isDirectory()) {
+                      _context2.n = 5;
+                      break;
+                    }
+                    _context2.n = 4;
+                    return processFiles(filePath);
+                  case 4:
+                    _context2.n = 7;
+                    break;
+                  case 5:
+                    _context2.n = 6;
+                    return uploadFile(filePath, turbo);
+                  case 6:
+                    uploadResult = _context2.v;
+                    // 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;
+                    }
                   case 7:
-                    _context2.next = 5;
+                    _context2.n = 9;
                     break;
+                  case 8:
+                    _context2.p = 8;
+                    _t2 = _context2.v;
+                    console.error('ERROR:', _t2);
                   case 9:
-                    _context2.next = 14;
+                    _context2.n = 2;
+                    break;
+                  case 10:
+                    _context2.n = 12;
                     break;
                   case 11:
-                    _context2.prev = 11;
-                    _context2.t1 = _context2["catch"](2);
-                    _iterator.e(_context2.t1);
-                  case 14:
-                    _context2.prev = 14;
+                    _context2.p = 11;
+                    _t3 = _context2.v;
+                    _iterator.e(_t3);
+                  case 12:
+                    _context2.p = 12;
                     _iterator.f();
-                    return _context2.finish(14);
-                  case 17:
-                  case "end":
-                    return _context2.stop();
+                    return _context2.f(12);
+                  case 13:
+                    return _context2.a(2);
                 }
-              }, _callee, null, [[2, 11, 14, 17]]);
+              }, _callee2, null, [[3, 8], [1, 11, 12, 13]]);
             }));
             return _processFiles.apply(this, arguments);
           };
-          processFiles = function _processFiles2(_x3) {
+          processFiles = function _processFiles2(_x5) {
             return _processFiles.apply(this, arguments);
           };
           turbo = _turboSdk.TurboFactory.authenticated({
             privateKey: jwk
           });
-          deployFolder = argv.deployFolder; //Uses Arweave manifest version 0.2.0, which supports fallbacks
+          deployFolder = argv.deployFolder; // Uses Arweave manifest version 0.2.0, which supports fallbacks
           newManifest = {
             manifest: 'arweave/paths',
             version: '0.2.0',
@@ -203,29 +207,28 @@ function _TurboDeploy() {
             },
             fallback: {},
             paths: {}
-          }; // starts processing files in the selected directory
-          _context4.next = 9;
+          }; // Starts processing files in the selected directory
+          _context4.n = 1;
           return processFiles(deployFolder);
-        case 9:
+        case 1:
           if (!newManifest.fallback.id) {
-            // if no 404.html file is found, manifest fallback is set to the txId of index.html
+            // 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;
           }
-          _context4.next = 12;
+          _context4.n = 2;
           return uploadManifest(newManifest);
-        case 12:
-          manifestId = _context4.sent;
+        case 2:
+          manifestId = _context4.v;
           if (!manifestId) {
-            _context4.next = 16;
+            _context4.n = 3;
             break;
           }
           console.log("Manifest uploaded with Id: ".concat(manifestId));
-          return _context4.abrupt("return", manifestId);
-        case 16:
-        case "end":
-          return _context4.stop();
+          return _context4.a(2, manifestId);
+        case 3:
+          return _context4.a(2);
       }
-    }, _callee3);
+    }, _callee4);
   }));
-  return _TurboDeploy.apply(this, arguments);
+  return _uploadDirectory.apply(this, arguments);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "permaweb-deploy",
-	"version": "2.0.2",
-	"description": "Permaweb app deployment package",
+	"version": "2.2.0",
+	"description": "Permaweb App Deployment Package",
 	"main": "index.js",
 	"scripts": {
 		"build": "babel src --out-dir dist"
@@ -12,6 +12,7 @@
 	"dependencies": {
 		"@ar.io/sdk": "^3.10.1",
 		"@ardrive/turbo-sdk": "^1.17.0",
+		"@permaweb/aoconnect": "^0.0.85",
 		"mime-types": "^2.1.35",
 		"yargs": "17.7.2"
 	},

package/src/index.js

@@ -1,13 +1,25 @@
 #!/usr/bin/env node
 
-import { ANT, ARIO, ArweaveSigner } from '@ar.io/sdk';
 import fs from 'fs';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
 
-import TurboDeploy from './turbo';
+import { ANT, AOProcess, ARIO, ARIO_MAINNET_PROCESS_ID, ARIO_TESTNET_PROCESS_ID, ArweaveSigner } from '@ar.io/sdk';
+import { TurboFactory } from '@ardrive/turbo-sdk';
+import { connect } from '@permaweb/aoconnect';
+
+import { uploadDirectory, uploadFile } from './turbo';
+
+const arweaveTxIdRegex = /^[a-zA-Z0-9-_]{43}$/;
 
 const argv = yargs(hideBin(process.argv))
+	.option('ario-process', {
+		alias: 'p',
+		type: 'string',
+		description: 'The ARIO process to use',
+		demandOption: true,
+		default: ARIO_MAINNET_PROCESS_ID
+	})
 	.option('arns-name', {
 		alias: 'n',
 		type: 'string',
@@ -20,6 +32,11 @@ const argv = yargs(hideBin(process.argv))
 		description: 'Folder to deploy.',
 		default: './dist',
 	})
+	.option('deploy-file', {
+		alias: 'f',
+		type: 'string',
+		description: 'File to deploy.'
+	})
 	.option('undername', {
 		alias: 'u',
 		type: 'string',
@@ -29,19 +46,19 @@ const argv = yargs(hideBin(process.argv))
 
 const DEPLOY_KEY = process.env.DEPLOY_KEY;
 const ARNS_NAME = argv.arnsName;
-
-export function getTagValue(list, name) {
-	for (let i = 0; i < list.length; i++) {
-		if (list[i]) {
-			if (list[i].name === name) {
-				return list[i].value;
-			}
-		}
-	}
-	return STORAGE.none;
+let ARIO_PROCESS = argv.arioProcess;
+if (ARIO_PROCESS === 'mainnet') {
+	ARIO_PROCESS = ARIO_MAINNET_PROCESS_ID;
+} else if (ARIO_PROCESS === 'testnet') {
+	ARIO_PROCESS = ARIO_TESTNET_PROCESS_ID;
 }
 
 (async () => {
+	if (!ARIO_PROCESS || !arweaveTxIdRegex.test(ARIO_PROCESS)) {
+		console.error('ARIO_PROCESS must be a valid Arweave transaction ID, or "mainnet" or "testnet"');
+		process.exit(1);
+	}
+
 	if (!DEPLOY_KEY) {
 		console.error('DEPLOY_KEY not configured');
 		process.exit(1);
@@ -52,32 +69,48 @@ export function getTagValue(list, name) {
 		process.exit(1);
 	}
 
-
-	if (argv.deployFolder.length == 0) {
-		console.error('deploy folder must not be empty');
+	if (argv.deployFile && !fs.existsSync(argv.deployFile)) {
+		console.error(`deploy-file [${argv.deployFolder}] does not exist`);
 		process.exit(1);
 	}
-
-	if (argv.undername.length == 0) {
-		console.error('undername must not be empty');
-		process.exit(1);
+	else {
+		if (!fs.existsSync(argv.deployFolder)) {
+			console.error(`deploy-folder [${argv.deployFolder}] does not exist`);
+			process.exit(1);
+		}
 	}
 
-	if (!fs.existsSync(argv.deployFolder)) {
-		console.error(`deploy folder [${argv.deployFolder}] does not exist`);
+	if (argv.undername.length === 0) {
+		console.error('undername must be set');
 		process.exit(1);
 	}
 
 	const jwk = JSON.parse(Buffer.from(DEPLOY_KEY, 'base64').toString('utf-8'));
-	const ario = ARIO.init()
-	const arnsNameRecord = await ario.getArNSRecord({name: ARNS_NAME}).catch((e) => {
+	const ario = ARIO.init({
+		process: new AOProcess({
+			processId: ARIO_PROCESS,
+			ao: connect({
+				MODE: 'legacy',
+				CU_URL: 'https://cu.ardrive.io'
+			})
+		})
+	});
+
+	const arnsNameRecord = await ario.getArNSRecord({ name: ARNS_NAME }).catch((e) => {
 		console.error(`ARNS name [${ARNS_NAME}] does not exist`);
 		process.exit(1);
 	});
 
-
 	try {
-		const manifestId = await TurboDeploy(argv, jwk);
+		let txId;
+		if (argv.deployFile) {
+			const turbo = TurboFactory.authenticated({ privateKey: jwk });
+			txId = (await uploadFile(argv.deployFile, turbo)).id;
+		}
+		else {
+			txId = await uploadDirectory(argv, jwk);
+		}
+
 		const signer = new ArweaveSigner(jwk);
 		const ant = ANT.init({ processId: arnsNameRecord.processId, signer });
 
@@ -85,9 +118,10 @@ export function getTagValue(list, name) {
 		await ant.setRecord(
 			{
 				undername: argv.undername,
-				transactionId: manifestId,
+				transactionId: txId,
 				ttlSeconds: 3600,
-			},{
+			},
+			{
 				tags: [
 					{
 						name: 'App-Name',
@@ -101,7 +135,7 @@ export function getTagValue(list, name) {
 			}
 		);
 
-		console.log(`Deployed TxId [${manifestId}] to name [${ARNS_NAME}] for ANT [${arnsNameRecord.processId}] using undername [${argv.undername}]`);
+		console.log(`Deployed TxId [${txId}] to name [${ARNS_NAME}] for ANT [${arnsNameRecord.processId}] using undername [${argv.undername}]`);
 	} catch (e) {
 		console.error('Deployment failed:', e);
 		process.exit(1); // Exit with error code

package/src/turbo/index.js

@@ -1,20 +1,47 @@
-import { TurboFactory } from '@ardrive/turbo-sdk';
 import fs from 'fs';
 import mime from 'mime-types';
 import path from 'path';
 import { Readable } from 'stream';
 
+import { TurboFactory } from '@ardrive/turbo-sdk';
+
 // Gets MIME types for each file to tag the upload
 function getContentType(filePath) {
 	const res = mime.lookup(filePath);
 	return res || 'application/octet-stream';
 }
 
-export default async function TurboDeploy(argv, jwk) {
+export async function uploadFile(path, turbo) {
+	console.log(`Uploading file: ${path}...`);
+	try {
+		const fileSize = fs.statSync(path).size;
+		const contentType = getContentType(path);
+		const uploadResult = await turbo.uploadFile({
+			fileStreamFactory: () => fs.createReadStream(path),
+			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 ${path} with id:`, uploadResult.id);
+
+		return uploadResult;
+	} catch (err) {
+		console.error(`Error uploading file ${path}:`, err);
+	}
+}
+
+export async function uploadDirectory(argv, jwk) {
 	const turbo = TurboFactory.authenticated({ privateKey: jwk });
 
 	const deployFolder = argv.deployFolder;
-	//Uses Arweave manifest version 0.2.0, which supports fallbacks
+	
+	// Uses Arweave manifest version 0.2.0, which supports fallbacks
 	let newManifest = {
 		manifest: 'arweave/paths',
 		version: '0.2.0',
@@ -32,35 +59,17 @@ export default async function TurboDeploy(argv, jwk) {
 				const relativePath = path.relative(deployFolder, filePath);
 
 				if (fs.statSync(filePath).isDirectory()) {
-					// recursively process all files in a directory
+					// 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 = 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);
+					const uploadResult = await uploadFile(filePath, turbo);
+
+					// 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) {
@@ -96,11 +105,11 @@ export default async function TurboDeploy(argv, jwk) {
 		}
 	}
 
-	// starts processing files in the selected directory
+	// 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
+		// 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;
 	}