Merge pull request #376 from permaweb/twilson63/refactor-weavedrive-o…

…n-boot

refactor: weavedrive on-boot

extensions/weavedrive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@permaweb/weavedrive",
-  "version": "0.0.10",
+  "version": "0.0.11",
   "license": "MIT",
   "main": "./dist/index.cjs",
   "scripts": {

extensions/weavedrive/src/index.js

@@ -18,10 +18,10 @@ module.exports = function weaveDrive(mod, FS) {
 
     async customFetch(path, options) {
       let urlList = null
-      if(mod.ARWEAVE.includes(',')) {
+      if (mod.ARWEAVE.includes(',')) {
         urlList = mod.ARWEAVE.split(',').map(url => url.trim())
       }
-      if(urlList && urlList.length > 0) {
+      if (urlList && urlList.length > 0) {
         /**
          * Try a list of gateways instead of a single one
          */
@@ -54,10 +54,10 @@ module.exports = function weaveDrive(mod, FS) {
       // This check/mkdir was added for AOP 6 Boot loader because create is
       // called first because were only loading Data, we needed to create
       // the directory. See: https://github.com/permaweb/aos/issues/342
-      if(!FS.analyzePath('/data/').exists){
+      if (!FS.analyzePath('/data/').exists) {
         FS.mkdir('/data/');
       }
-      
+
       var node = FS.createFile('/', 'data/' + id, properties, true, false);
       // Set initial parameters
       var bytesLength = await this.customFetch(`/${id}`, { method: 'HEAD' }).then(res => res.headers.get('Content-Length'))
@@ -170,7 +170,7 @@ module.exports = function weaveDrive(mod, FS) {
           }
         }
       }`
-    var variables = { transactionIds: [id] }
+      var variables = { transactionIds: [id] }
       async function retry(x) {
         return new Promise(r => {
           setTimeout(function () {
@@ -195,23 +195,23 @@ module.exports = function weaveDrive(mod, FS) {
           return res?.data?.transactions?.edges?.[0]?.node ? res.data.transactions.edges[0].node : 'No results'
         })
         .then(async entry => {
-          return typeof(entry) == 'string' ? entry : { 
+          return typeof (entry) == 'string' ? entry : {
             format: 3,
             ...entry
           }
         })
         .then(x => {
-          return typeof(x) == 'string' ? x : JSON.stringify(x)
+          return typeof (x) == 'string' ? x : JSON.stringify(x)
         });
-
 
-        if (result === 'No results') {
-          return result
-        }
-        FS.createDataFile('/', 'tx2/' + id, result, true, false);
-        var stream = FS.open('/tx2/' + id, 'r');
 
-        return stream;
+      if (result === 'No results') {
+        return result
+      }
+      FS.createDataFile('/', 'tx2/' + id, result, true, false);
+      var stream = FS.open('/tx2/' + id, 'r');
+
+      return stream;
     },
     async open(filename) {
       const pathCategory = filename.split('/')[1];
@@ -434,7 +434,7 @@ module.exports = function weaveDrive(mod, FS) {
 
       // Check if we are attempting to load the On-Boot id, if so allow it
       // this was added for AOP 6 Boot loader See: https://github.com/permaweb/aos/issues/342
-      const bootTag = mod.Process.Tags.find((t) => t.name === 'On-Boot')?.value;
+      const bootTag = mod.spawn.tags['On-Boot'];
       if (bootTag && (bootTag === ID)) return true;
 
       // Check that this module or process set the WeaveDrive tag on spawn
@@ -554,7 +554,7 @@ module.exports = function weaveDrive(mod, FS) {
       const json = JSON.parse(results)
       return json.data.transactions.edges.length > 0
     },
-    
+
     async gqlExists() {
       const query = `query {
         transactions(
@@ -566,7 +566,7 @@ module.exports = function weaveDrive(mod, FS) {
         }
       }
       `
-      
+
       const gqlExists = await this.gqlQuery(query, {}).then((res) => res.ok)
       return gqlExists
     },

extensions/weavedrive/test/index.test.js

@@ -12,9 +12,9 @@ const Module = {
   Id: "MODULE",
   Owner: "OWNER",
   Tags: [
-    { name: 'Data-Protocol', value: 'ao'},
-    { name: 'Variant', value: 'ao.TN.1'},
-    { name: 'Type', value: 'Module'},
+    { name: 'Data-Protocol', value: 'ao' },
+    { name: 'Variant', value: 'ao.TN.1' },
+    { name: 'Type', value: 'Module' },
     { name: 'Authority', value: 'PROCESS' }
   ]
 }
@@ -48,15 +48,22 @@ const Msg = {
 }
 
 const options = {
-    format: 'wasm64-unknown-emscripten-draft_2024_02_15',
-    WeaveDrive: weaveDrive,
-    ARWEAVE: 'https://arweave.net',
-    mode: "test",
-    blockHeight: 1000,
-    spawn: {
-      "Scheduler": "TEST_SCHED_ADDR"
-    },
-    process: Process
+  format: 'wasm64-unknown-emscripten-draft_2024_02_15',
+  WeaveDrive: weaveDrive,
+  ARWEAVE: 'https://arweave.net',
+  mode: "test",
+  blockHeight: 1000,
+  spawn: {
+    tags: {
+      "Scheduler": "TEST_SCHED_ADDR",
+      "On-Boot": "Fmtgzy1Chs-5ZuUwHpQjQrQ7H7v1fjsP0Bi8jVaDIKA"
+    }
+  },
+  module: {
+    tags: {
+
+    }
+  }
 }
 
 test('load client source', async () => {
@@ -148,8 +155,8 @@ return require('json').encode({ A = #results, B = #results2 })
 
 // test weavedrive feature of acceptint multiple gateways
 test('read block, multi url', async () => {
-  const handle = await AoLoader(wasm, { 
-    ...options, 
+  const handle = await AoLoader(wasm, {
+    ...options,
     ARWEAVE: 'https://arweave.net,https://g8way.io'
   })
   const result = await handle(memory, {
@@ -163,8 +170,8 @@ test('read block, multi url', async () => {
 
 
 test('read tx, multi url', async () => {
-  const handle = await AoLoader(wasm, { 
-    ...options, 
+  const handle = await AoLoader(wasm, {
+    ...options,
     ARWEAVE: 'https://arweave.net,https://g8way.io'
   })
   const result = await handle(memory, {
@@ -242,10 +249,10 @@ return result
 
 let memoryBootLoader = null
 
- /*
-  * The Process is also the first message when aop 6 boot loader
-  * is enabled in the network
-  */
+/*
+ * The Process is also the first message when aop 6 boot loader
+ * is enabled in the network
+ */
 const ProcessBootLoaderData = {
   Id: 'PROCESS',
   Owner: 'PROCESS',
@@ -261,20 +268,22 @@ const ProcessBootLoaderData = {
   ],
   Data: `
 Test = 1
+print("Test " .. Test)
     `,
   From: 'PROCESS',
   Module: 'MODULE',
   "Block-Height": 1000,
   Timestamp: Date.now()
 }
 
-const optionsBootLoaderData = { ...options, Process: ProcessBootLoaderData, mode: null}
+const optionsBootLoaderData = { ...options, mode: null }
 
 test('boot loader set to Data', async function () {
   const handle = await AoLoader(bootLoaderWasm, optionsBootLoaderData)
-  await handle(memoryBootLoader, {
+  const result = await handle(memoryBootLoader, {
     ...ProcessBootLoaderData
   }, { Process: ProcessBootLoaderData, Module })
+  assert.equal(result.Output.data, 'Test 1')
 })
 
 const ProcessBootLoaderTx = {
@@ -299,11 +308,12 @@ Test = 1
   Timestamp: Date.now()
 }
 
-const optionsBootLoaderTx = { ...options, Process: ProcessBootLoaderTx, mode: null}
+const optionsBootLoaderTx = { ...options, mode: null }
 
 test('boot loader set to tx id', async function () {
   const handle = await AoLoader(bootLoaderWasm, optionsBootLoaderTx)
-  await handle(memoryBootLoader, {
+  const result = await handle(memoryBootLoader, {
     ...ProcessBootLoaderTx
   }, { Process: ProcessBootLoaderTx, Module })
+  assert.equal(result.Output.data, '')
 })