Support multiple agents ad4m-test

bootstrap-languages/agent-language/hc-dna/zomes/tests/package.json

@@ -18,7 +18,7 @@
     "lodash": "^4.17.19",
     "tape-promise": "^4.0.0",
     "ts-node": "^10.8.0",
-    "typescript": "^4.2.4"
+    "typescript": "^4.6.2"
   },
   "devDependencies": {
     "@types/tape-promise": "^4.0.1",

bootstrap-languages/agent-language/package.json

@@ -35,7 +35,7 @@
     "svelte-check": "^1.0.0",
     "svelte-preprocess": "^4.0.0",
     "tslib": "^2.0.0",
-    "typescript": "^4.2.4",
+    "typescript": "^4.6.2",
     "xmlhttprequest": "^1.8.0"
   },
   "dependencies": {

bootstrap-languages/direct-message-language/hc-dna/tests/package.json

@@ -19,7 +19,7 @@
     "lodash": "^4.17.19",
     "tape-promise": "^4.0.0",
     "ts-node": "^10.8.0",
-    "typescript": "^4.2.4"
+    "typescript": "^4.6.2"
   },
   "devDependencies": {
     "@types/faker": "^5.5.3",

bootstrap-languages/direct-message-language/package.json

@@ -27,7 +27,7 @@
     "rollup-plugin-terser": "^7.0.0",
     "run-script-os": "^1.1.6",
     "tslib": "^2.0.0",
-    "typescript": "^4.2.4"
+    "typescript": "^4.6.2"
   },
   "dependencies": {
     "@types/node": "^18.0.0"

bootstrap-languages/file-storage/hc-dna/tests/package.json

@@ -10,7 +10,7 @@
     "tape-promise": "^4.0.0",
     "ts-node": "^10.8.0",
     "@types/node": "^14.0.14",
-    "typescript": "^4.2.4"
+    "typescript": "^4.6.2"
   },
   "devDependencies": {
     "@types/faker": "^5.5.3",

bootstrap-languages/file-storage/package.json

@@ -37,7 +37,7 @@
     "svelte-check": "^1.0.0",
     "svelte-preprocess": "^4.0.0",
     "tslib": "^2.0.0",
-    "typescript": "^4.2.4",
+    "typescript": "^4.6.2",
     "uint8arrays": "^3.0.0",
     "run-script-os": "^1.1.6"
   }

bootstrap-languages/language-language/package.json

@@ -26,7 +26,7 @@
     "svelte-check": "^1.0.0",
     "svelte-preprocess": "^4.0.0",
     "tslib": "^2.0.0",
-    "typescript": "^4.2.4"
+    "typescript": "^4.6.2"
   },
   "dependencies": {
     "@types/node": "^18.0.0",

bootstrap-languages/local-language-persistence/.gitignore

@@ -0,0 +1,5 @@
+node_modules
+*.js
+*.js.map
+!rollup.config.js
+build

bootstrap-languages/local-language-persistence/README.md

@@ -0,0 +1,3 @@
+# Language: languages
+
+This is used as a "mock" language for ad4m-executor tests and should not be used for any other purpose

bootstrap-languages/local-language-persistence/adapter.ts

@@ -0,0 +1,26 @@
+import type { Address, Expression, ExpressionAdapter, PublicSharing, LanguageContext } from "@perspect3vism/ad4m";
+import { PutAdapter } from "./putAdapter";
+import fs from "fs";
+import path from "path";
+
+export default class Adapter implements ExpressionAdapter {
+  putAdapter: PublicSharing;
+  #storagePath: string;
+
+  constructor(context: LanguageContext) {
+    this.putAdapter = new PutAdapter(context);
+    //@ts-ignore
+    if ("storagePath" in context.customSettings) { this.#storagePath = context.customSettings["storagePath"] } else { this.#storagePath = "./src/tst-tmp/languages" };
+  }
+
+  async get(address: Address): Promise<void | Expression> {
+    const metaPath = path.join(this.#storagePath, `meta-${address}.json`)
+    if (fs.existsSync(metaPath)) {
+      const metaFile = JSON.parse(fs.readFileSync(metaPath).toString());
+      console.log("Found meta file info", metaFile);
+      return metaFile
+    } else {
+      return null
+    } 
+  }
+}

bootstrap-languages/local-language-persistence/index.ts

@@ -0,0 +1,21 @@
+import type { Address, Agent, Language, HolochainLanguageDelegate, LanguageContext, Interaction, ExpressionUI } from "@perspect3vism/ad4m";
+import LangAdapter from "./languageAdapter";
+import Adapter from "./adapter";
+
+export const name = "languages";
+
+function interactions(expression: Address): Interaction[] {
+  return [];
+}
+
+export default async function create(context: LanguageContext): Promise<Language> {
+  const expressionAdapter = new Adapter(context);
+  const languageAdapter = new LangAdapter(context);
+
+  return {
+    name,
+    expressionAdapter,
+    languageAdapter,
+    interactions,
+  } as Language;
+}

bootstrap-languages/local-language-persistence/languageAdapter.ts

@@ -0,0 +1,21 @@
+import type { Address, LanguageAdapter, PublicSharing, LanguageContext } from "@perspect3vism/ad4m";
+import path from "path";
+import fs from "fs";
+
+export default class LangAdapter implements LanguageAdapter {
+  putAdapter: PublicSharing;
+  #storagePath: string;
+
+  constructor(context: LanguageContext) {
+    //@ts-ignore
+    if ("storagePath" in context.customSettings) { this.#storagePath = context.customSettings["storagePath"] } else { this.#storagePath = "./src/tst-tmp/languages" };
+  }
+
+  async getLanguageSource(address: Address): Promise<string> {
+    const bundlePath = path.join(this.#storagePath, `bundle-${address}.js`);
+    if (fs.existsSync(bundlePath)) {
+      const metaFile = fs.readFileSync(bundlePath).toString();
+      return metaFile
+    }
+  }
+}

bootstrap-languages/local-language-persistence/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "@perspect3vism/local-language-language",
+  "version": "0.0.10",
+  "description": "An AD4M Language for storing of language bundles on IPFS",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"No tests for local language language\"",
+    "build": "tsc && rollup -c",
+    "dev": "tsc && rollup -c -w"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "@perspect3vism/ad4m": "*",
+    "@perspect3vism/rollup-plugin-dna": "^0.0.2",
+    "@rollup/plugin-commonjs": "^14.0.0",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^8.0.0",
+    "@rollup/plugin-typescript": "^4.0.0",
+    "@tsconfig/svelte": "^1.0.0",
+    "ipfs-core-types": "0.10.1",
+    "rollup": "^2.3.4",
+    "rollup-plugin-postcss": "^3.1.8",
+    "rollup-plugin-string": "^3.0.0",
+    "rollup-plugin-svelte": "^6.0.0",
+    "rollup-plugin-terser": "^7.0.0",
+    "svelte": "^3.0.0",
+    "svelte-check": "^1.0.0",
+    "svelte-preprocess": "^4.0.0",
+    "tslib": "^2.0.0",
+    "typescript": "^4.6.2"
+  },
+  "dependencies": {
+    "@types/node": "^14.14.37",
+    "debug": "^4.3.2",
+    "path": "^0.12.7"
+  }
+}

bootstrap-languages/local-language-persistence/putAdapter.ts

@@ -0,0 +1,43 @@
+import type { Address, AgentService, PublicSharing, LanguageContext, LanguageLanguageInput} from "@perspect3vism/ad4m";
+import type { IPFS } from "ipfs-core-types";
+import path from "path";
+import fs from "fs";
+
+export default function sleep(ms: number): Promise<any> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export class PutAdapter implements PublicSharing {
+  #agent: AgentService;
+  #IPFS: IPFS;
+  #storagePath: string;
+
+  constructor(context: LanguageContext) {
+    this.#agent = context.agent;
+    this.#IPFS = context.IPFS;
+    // @ts-ignore
+    if ("storagePath" in context.customSettings) { this.#storagePath = context.customSettings["storagePath"] } else { this.#storagePath = "./src/tst-tmp/languages" };
+  }
+
+  async createPublic(language: LanguageLanguageInput): Promise<Address> {
+    const ipfsAddress = await this.#IPFS.add(
+      { content: language.bundle.toString()},
+      { onlyHash: true},
+    );
+    // @ts-ignore
+    const hash = ipfsAddress.cid.toString();
+
+    if(hash != language.meta.address)
+      throw new Error(`Language Persistence: Can't store language. Address stated in meta differs from actual file\nWanted: ${language.meta.address}\nGot: ${hash}`)
+
+    const agent = this.#agent;
+    const expression = agent.createSignedExpression(language.meta);
+    const metaPath = path.join(this.#storagePath, `meta-${hash}.json`);
+    const bundlePath = path.join(this.#storagePath, `bundle-${hash}.js`);
+    console.log("Writing meta & bundle path: ", metaPath, bundlePath);
+    fs.writeFileSync(metaPath, JSON.stringify(expression));
+    fs.writeFileSync(bundlePath, language.bundle.toString());
+
+    return hash as Address;
+  }
+}

bootstrap-languages/local-language-persistence/rollup.config.js

@@ -0,0 +1,62 @@
+import svelte from "rollup-plugin-svelte";
+import resolve from "@rollup/plugin-node-resolve";
+import commonjs from "@rollup/plugin-commonjs";
+//import { terser } from 'rollup-plugin-terser';
+import sveltePreprocess from "svelte-preprocess";
+import postcss from "rollup-plugin-postcss";
+import { string } from "rollup-plugin-string";
+import json from "@rollup/plugin-json";
+
+const production = !process.env.ROLLUP_WATCH;
+
+export default {
+  input: "index.js",
+  output: {
+    sourcemap: true,
+    format: "cjs",
+    name: "NoteIpfs",
+    file: "build/bundle.js",
+  },
+  plugins: [
+    string({
+      include: "build/*.js",
+    }),
+    svelte({
+      // enable run-time checks when not in production
+      dev: !production,
+      // we'll extract any component CSS out into
+      // a separate file - better for performance
+      //css: css => {
+      //	css.write('bundle.css');
+      //},
+      preprocess: sveltePreprocess(),
+    }),
+
+    // If you have external dependencies installed from
+    // npm, you'll most likely need these plugins. In
+    // some cases you'll need additional configuration -
+    // consult the documentation for details:
+    // https://github.com/rollup/plugins/tree/master/packages/commonjs
+    resolve({
+      browser: false,
+      dedupe: ["svelte"],
+    }),
+    commonjs(),
+    postcss({
+      extract: true,
+      minimize: true,
+      use: [
+        [
+          "sass",
+          {
+            includePaths: ["./src/ui/theme", "./node_modules"],
+          },
+        ],
+      ],
+    }),
+    json()
+  ],
+  watch: {
+    clearScreen: false,
+  },
+};

bootstrap-languages/local-language-persistence/tsconfig.json

@@ -0,0 +1,28 @@
+{
+  "$schema": "https://json.schemastore.org/tsconfig",
+  "display": "Svelte",
+  "compilerOptions": {
+    "moduleResolution": "node",
+    "target": "es2017",
+    /** 
+      Svelte Preprocess cannot figure out whether you have a value or a type, so tell TypeScript
+      to enforce using `import type` instead of `import` for Types.
+     */
+    "importsNotUsedAsValues": "error",
+    "isolatedModules": true,
+    /**
+      To have warnings/errors of the Svelte compiler at the correct position,
+      enable source maps by default.
+     */
+    "sourceMap": true,
+    /** Requests the runtime types from the svelte modules by default. Needed for TS files or else you get errors. */
+    "types": ["svelte", "node"],
+
+    "strict": false,
+    "esModuleInterop": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "include": ["*.ts"],
+  "exclude": ["node_modules/*", "__sapper__/*", "public/*"],
+}