js-dos 7.2.7 → 7.3.3

package/examples/digger/index.html

@@ -28,11 +28,12 @@
         // bundleUrl = "https://cdn.dos.zone/original/2X/a/ac888d1660aa253f0ed53bd6c962c894125aaa19.jsdos"; // wolf 3d
         // bundleUrl = "https://cdn.dos.zone/custom/dos/homm_2.jsdos"; // heroes of might and magic 2
         // bundleUrl = "https://doszone-uploads.s3.dualstack.eu-central-1.amazonaws.com/original/2X/6/60b165c86771eadf24cb2f81aef4656b85d167a6.jsdos"; // transport tycoon deluxe
-        // bundleUrl = "doom_coop.jsdos";
+        bundleUrl = "doom_coop.jsdos";
         let clientId = null;
         emulators.pathPrefix = "/dist/";
         Dos(document.getElementById("jsdos"), {
             hardware: window.hardware,
+            withExperimentalApi: true,
             clientId: (userGesture) => {
                 if (!userGesture) {
                     return Promise.resolve(clientId);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "js-dos",
-    "version": "7.2.7",
+    "version": "7.3.3",
     "description": "Easiest API to run dos programs in browser",
     "main": "dist/js-dos.js",
     "types": "dist/types/src/player.d.ts",
@@ -48,7 +48,7 @@
         "browserify": "^17.0.0",
         "core-js": "^3.17.1",
         "del": "^5.1.0",
-        "emulators": "^0.72.1",
+        "emulators": "^0.72.5",
         "emulators-ui": "^0.72.9",
         "eslint": "^7.32.0",
         "eslint-config-google": "^0.14.0",

package/.github/workflows/codeql-analysis.yml

@@ -1,70 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ 7.xx ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ 7.xx ]
-  schedule:
-    - cron: '33 3 * * 6'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'typescript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

package/.github/workflows/yarn-gulp.yml

@@ -1,30 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ 7.xx ]
-  pull_request:
-    branches: [ 7.xx ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        node-version: [12.x, 14.x, 16.x]
-    
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Use Node.js ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
-      with:
-        node-version: ${{ matrix.node-version }}
-
-    - name: Build
-      run: |
-        npm install -g yarn
-        yarn
-        yarn run eslint . --ext ts --max-warnings 0
-        yarn run gulp

package/dist/types/src/backend/jj/jj-config.d.ts

@@ -1,6 +0,0 @@
-export interface AwsRegion {
-    label: string;
-    name: string;
-    ok: string;
-}
-export declare const awsRegions: AwsRegion[];

package/dist/types/src/components/action-exit.d.ts

@@ -1,2 +0,0 @@
-import { Props } from "../player-app";
-export declare function ActionExit(props: Props): import("preact").VNode<any> | import("preact").VNode<any>[];

package/dist/types/src/components/sidebar/active-token.d.ts

@@ -1,2 +0,0 @@
-import { Props } from "../../player-app";
-export declare function ActiveToken(props: Props): import("preact").VNode<any> | import("preact").VNode<any>[];

package/dist/types/src/components/sidebar/create-token.d.ts

@@ -1,2 +0,0 @@
-import { Props } from "../../player-app";
-export declare function CreateToken(props: Props): import("preact").VNode<any> | import("preact").VNode<any>[];

package/v7-services/.env

@@ -1,6 +0,0 @@
-# Learn more about about the credentials needed
-# to deploy your app https://github.com/serverless/components#credentials
-
-# AWS:
-# AWS_ACCESS_KEY_ID=<your access key>
-# AWS_SECRET_ACCESS_KEY=<your secret access key>

package/v7-services/ok.yaml

@@ -1,24 +0,0 @@
-service: jsdos-ok
-
-package:
-  exclude:
-    - 'node_modules/**'
-
-provider:
-  name: aws
-  runtime: nodejs14.x
-  memorySize: 128
-  versionFunctions: false
-
-functions:
-  ok:
-    handler: src/ok.ok
-    name: jsdos-ok
-    events:
-      - http:
-          path: /ok
-          method: get
-          cors: true
-
-plugins:
-  - serverless-plugin-typescript

package/v7-services/package.json

@@ -1,17 +0,0 @@
-{
-  "name": "js-dos-v7-services",
-  "description": "",
-  "version": "0.1.0",
-  "license": "GPL-2.0",
-  "dependencies": {
-    "nanoid": "^3.1.30"
-  },
-  "devDependencies": {
-    "@types/aws-lambda": "^8.10.88",
-    "@types/node": "^14.6.4",
-    "aws-sdk": "^2.1048.0",
-    "serverless": "^2.69.1",
-    "serverless-plugin-typescript": "^2.1.0",
-    "typescript": "^4.5.4"
-  }
-}

package/v7-services/redeploy-ok.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -ex
-
-yarn run sls deploy -c ok.yaml --verbose --region us-east-1 
-yarn run sls deploy -c ok.yaml --verbose --region us-east-2
-yarn run sls deploy -c ok.yaml --verbose --region us-west-1
-yarn run sls deploy -c ok.yaml --verbose --region us-west-2
-yarn run sls deploy -c ok.yaml --verbose --region eu-central-1
-yarn run sls deploy -c ok.yaml --verbose --region eu-west-1
-yarn run sls deploy -c ok.yaml --verbose --region eu-west-2
-yarn run sls deploy -c ok.yaml --verbose --region eu-south-1
-yarn run sls deploy -c ok.yaml --verbose --region eu-west-3
-yarn run sls deploy -c ok.yaml --verbose --region eu-north-1
-yarn run sls deploy -c ok.yaml --verbose --region ap-east-1
-yarn run sls deploy -c ok.yaml --verbose --region ap-south-1
-yarn run sls deploy -c ok.yaml --verbose --region ap-northeast-3
-yarn run sls deploy -c ok.yaml --verbose --region ap-northeast-2
-yarn run sls deploy -c ok.yaml --verbose --region ap-southeast-1
-yarn run sls deploy -c ok.yaml --verbose --region ap-southeast-2
-yarn run sls deploy -c ok.yaml --verbose --region ap-northeast-1
-yarn run sls deploy -c ok.yaml --verbose --region ca-central-1
-yarn run sls deploy -c ok.yaml --verbose --region me-south-1
-yarn run sls deploy -c ok.yaml --verbose --region sa-east-1
-yarn run sls deploy -c ok.yaml --verbose --region af-south-1

package/v7-services/serverless.yml

@@ -1,140 +0,0 @@
-org: caiiiycuk
-app: jsdos-backend
-service: jsdos-v7
-
-provider:
-  name: aws
-  runtime: nodejs14.x
-  region: eu-central-1
-  memorySize: 256
-  versionFunctions: false
-  environment:
-    NETWORKING_TABLE: "v2_r1_dznetworking"
-    PUT_CURL: "jjs-putCurl"
-    RUN_INSTANCE: "jjs-runInstanceV2"
-  iamRoleStatements:
-    - Effect: Allow
-      Action:
-        - s3:ListBucket
-      Resource:
-        - "arn:aws:s3:::doszone-uploads"
-    - Effect: Allow
-      Action:
-        - s3:Get*
-        - s3:Put*
-      Resource:
-        - "arn:aws:s3:::doszone-uploads/*"
-    - Effect: Allow
-      Action:
-        - lambda:InvokeFunction
-      Resource:
-        - "arn:aws:lambda:${opt:region, self:provider.region}:*:function:${self:provider.environment.PUT_CURL}"
-        - "arn:aws:lambda:${opt:region, self:provider.region}:*:function:${self:provider.environment.RUN_INSTANCE}"
-    - Effect: Allow
-      Action:
-        - dynamodb:Query
-        - dynamodb:Scan
-        - dynamodb:GetItem
-        - dynamodb:PutItem
-        - dynamodb:UpdateItem
-        - dynamodb:DeleteItem
-      Resource:
-        - "arn:aws:dynamodb:${opt:region, self:provider.region}:*:table/${self:provider.environment.NETWORKING_TABLE}"
-
-functions:
-  getTokenCost: 
-    handler: src/networking/get-token-cost.getTokenCost
-    name: jsdos-getTokenCost
-    events:
-      - http:
-          path: /token/cost/get
-          method: get
-          cors: true
-  getFreeToken:
-    handler: src/networking/get-free-token.getFreeToken
-    name: jsdos-getFreeToken
-    events:
-      - http:
-          path: /token/free/get
-          method: get
-          cors: true
-  getTokenInfo:
-    handler: src/networking/get-token-info.getTokenInfo
-    name: jsdos-getTokenInfo
-    events:
-      - http:
-          path: /token/info/get
-          method: get
-          cors: true
-  startIpx:
-    handler: src/networking/ipx/start-ipx.startIpx
-    name: jsdos-startIpx
-    events:
-      - http:
-          path: /token/ipx/start
-          method: get
-          cors: true
-  putIpxIp:
-    handler: src/networking/ipx/put-ipx-ip.putIpxIp
-    name: jsdos-putIpxIp
-    events:
-      - http:
-          path: /token/ipx/ip/put
-          method: put
-          cors: true
-  stopIpx:
-    handler: src/networking/ipx/stop-ipx.stopIpx
-    name: jsdos-stopIpx
-    events:
-      - http:
-          path: /token/ipx/stop
-          method: post
-          cors: true
-  personalPut:
-    handler: src/personal-put.personalPut
-    name: jsdos-personalPut
-    events:
-      - http:
-          path: /personal/put
-          method: post
-          cors: true
-  personalAcl:
-    handler: src/personal-acl.personalAcl
-    name: jsdos-personalAcl
-    events:
-      - http:
-          path: /personal/acl
-          method: post
-          cors: true
-
-resources:
-  Resources:
-    dznetworking:
-      Type: 'AWS::DynamoDB::Table'
-      DeletionPolicy: Retain
-      Properties:
-        AttributeDefinitions:
-          -
-            AttributeName: key
-            AttributeType: S
-          -
-            AttributeName: day
-            AttributeType: N
-        KeySchema:
-          -
-            AttributeName: key
-            KeyType: HASH
-        GlobalSecondaryIndexes:
-          -
-            IndexName: day
-            KeySchema:
-            -
-              AttributeName: day
-              KeyType: HASH
-            Projection:
-              ProjectionType: ALL
-        TableName: ${self:provider.environment.NETWORKING_TABLE}
-        BillingMode: PAY_PER_REQUEST
-
-plugins:
-  - serverless-plugin-typescript

package/v7-services/src/networking/day.ts

@@ -1,5 +0,0 @@
-export function getDayOrigin() {
-    const date = new Date();
-    return (Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()) -
-        Date.UTC(date.getFullYear(), 0, 0)) / 24 / 60 / 60 / 1000 + date.getFullYear() * 366;
-}

package/v7-services/src/networking/get-free-token.ts

@@ -1,33 +0,0 @@
-import { error, badRequest, success } from "../responses";
-import { getDayOrigin } from "./day";
-import { freeTierSoftLimit, freeTierHardLimit } from "./limits";
-import { createFreeToken, getFreeTierHardCount, getFreeTierSoftCount } from "./token";
-
-export const getFreeToken = async (event: any) => {
-    const namespace = event.queryStringParameters?.namespace;
-    const id = event.queryStringParameters?.id;
-    const region = event.queryStringParameters?.region;
-    const day = getDayOrigin();
-
-    if (!namespace || !id || !region) {
-        return badRequest();
-    }
-
-    const softCount = await getFreeTierSoftCount(namespace, id, day);
-    if (softCount >= freeTierSoftLimit) {
-        return error("free-soft-limit");
-    }
-
-    const hardCount = await getFreeTierHardCount(day);
-    if (hardCount >= freeTierHardLimit) {
-        return error("free-hard-limit");
-    }
-
-    try {
-        return success({
-            token: await createFreeToken(namespace, id, day, region),
-        });
-    } catch (e) {
-        return error(e.message);
-    }
-};

package/v7-services/src/networking/get-token-cost.ts

@@ -1,31 +0,0 @@
-import { error, badRequest, success } from "../responses";
-import { getDayOrigin } from "./day";
-import { freeTierSoftLimit, freeTierSec, freeTierHardLimit } from "./limits";
-import { getFreeTierHardCount, getFreeTierSoftCount } from "./token";
-
-export const getTokenCost = async (event: any) => {
-    const namespace = event.queryStringParameters?.namespace;
-    const id = event.queryStringParameters?.id;
-    const durationSec = Number.parseInt(event.queryStringParameters?.durationSec);
-    const day = getDayOrigin();
-
-    if (!namespace || !id || !durationSec || isNaN(durationSec)) {
-        return badRequest();
-    }
-
-    if (freeTierSec !== durationSec) {
-        return error("30-min-required");
-    }
-
-    if (await getFreeTierSoftCount(namespace, id, day) >= freeTierSoftLimit) {
-        return error("free-soft-limit");
-    }
-
-    if (await getFreeTierHardCount(day) >= freeTierHardLimit) {
-        return error("free-hard-limit");
-    }
-
-    return success({
-        cost: 0,
-    });
-};

package/v7-services/src/networking/get-token-info.ts

@@ -1,16 +0,0 @@
-import { badRequest, error, success } from "../responses";
-import { getToken } from "./token";
-
-export const getTokenInfo = async (event: any) => {
-    const token = event.queryStringParameters?.token;
-
-    if (!token) {
-        return badRequest();
-    }
-
-    try {
-        return success(await getToken(token));
-    } catch (e) {
-        return error(e.message);
-    }
-};

package/v7-services/src/networking/ipx/put-ipx-ip.ts

@@ -1,20 +0,0 @@
-import { error, badRequest, success } from "../../responses";
-import { putIp } from "../token";
-
-export const putIpxIp = async (event: any) => {
-    const token = event.queryStringParameters?.token;
-    const arn = event.queryStringParameters?.arn;
-    const ip = event.queryStringParameters.ip;
-
-    if (!token || !arn || !ip) {
-        return badRequest();
-    }
-
-    try {
-        await putIp(token, arn, ip, "ipx");
-        return success({});
-    } catch (e) {
-        console.error("Can't update ipx ip", e);
-        return error(e.message);
-    }
-};

package/v7-services/src/networking/ipx/start-ipx.ts

@@ -1,16 +0,0 @@
-import { error, badRequest, success } from "../../responses";
-import { newTask } from "../token";
-
-export const startIpx = async (event: any) => {
-    const token = event.queryStringParameters?.token;
-    if (!token) {
-        return badRequest();
-    }
-
-    try {
-        return success({ arn: await newTask(token, "ipx") });
-    } catch (e) {
-        console.error("Can't start ipx-server", e);
-        return error(e.message);
-    }
-};

package/v7-services/src/networking/ipx/stop-ipx.ts

@@ -1,19 +0,0 @@
-import { error, badRequest, success } from "../../responses";
-import { stopTask } from "../token";
-
-export const stopIpx = async (event: any) => {
-    const token = event.queryStringParameters?.token;
-    const arn = event.queryStringParameters?.arn;
-
-    if (!token || !arn) {
-        return badRequest();
-    }
-
-    try {
-        await stopTask(token, arn, "ipx");
-        return success({});
-    } catch (e) {
-        console.error("Can't update ipx ip", e);
-        return error(e.message);
-    }
-};

package/v7-services/src/networking/limits.ts

@@ -1,3 +0,0 @@
-export const freeTierSoftLimit = 24;
-export const freeTierHardLimit = 256;
-export const freeTierSec = 30 * 60; // 30 min